deac/gitlabhq
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity
4768 commits 6 branches 43 tags 25 MiB
Commit graph

69 commits

Author SHA1 Message Date
Dmitriy Zaporozhets f5dec306fd Use project_with_code factory where necessary 2013-04-01 18:16:08 +03:00
Dan Knox 8300ae366c Fix the Cancel button on the Edit Wiki page. 
The Cancel button on the Edit Wiki page was still redirecting back
to the "Index" page which is no longer the default Wiki page.

This commit changes the Cancel button in the following ways:

  * Pressing Cancel while editing an existing Wiki page will now
    redirect you back to the latest version of that page.
  * Pressing Cancel while editing a brand new Wiki home page that
    does not yet exist will redirect you to back to the same Edit
    Wiki Home page.
 2013-03-19 21:36:09 -07:00
Dmitriy Zaporozhets 0cbb235c3e fix incorrectly moved spinach step 2013-03-19 17:53:21 +02:00
Dmitriy Zaporozhets 063c4a069c fix wall feature. removed duplicated test 2013-03-19 14:58:58 +02:00
Dmitriy Zaporozhets 71ab011a17 Merge branch 'use_gollum_wikis' of https://github.com/DanKnox/gitlabhq into DanKnox-use_gollum_wikis 
Conflicts:
	app/views/layouts/project_resource.html.haml
	app/views/wikis/edit.html.haml
	app/views/wikis/pages.html.haml
	app/views/wikis/show.html.haml
	spec/features/gitlab_flavored_markdown_spec.rb
 2013-03-15 16:55:07 +02:00
Dmitriy Zaporozhets 753ecbdcec Change spinach tab tests to fit new tabs navigation 2013-03-14 21:51:44 +02:00
Dmitriy Zaporozhets ef05423f47 Finish select2-ajax for users. Added Select2Helper for tests 2013-03-14 10:16:27 +02:00
Dmitriy Zaporozhets 496b7da7a0 Fix spinach tests 2013-03-13 21:58:32 +02:00
Dmitriy Zaporozhets fa9a8c3847 Remove team_member show page -> use user_path instead 2013-03-13 19:16:36 +02:00
Dan Knox 1479f17227 Add Spinach coverage for Gollum Wiki system and correct the Delete link. 
The previously failing Spinach steps have been fixed with this commit.
I have also added new steps that cover the entire usage of the Wiki
system.

The new Spinach steps revealed a minor bug in the Delete page process.
The path for the "Delete this page" button was previously set to
`project_wikis_page(@project, @wiki)` when it should have been
using the singular `project_wiki_page(@project, @wiki)` path helper.

The link has been corrected and all steps are now passing.
 2013-03-10 14:59:20 -07:00
Sato Hiroyuki e03a018d28 Refactor: rename module and class names. 
* Module: Graph -> Network
* Class: JsonBuilder -> Graph
 2013-03-07 15:42:30 +09:00
Sato Hiroyuki 83435e3d46 Adding sleep statements to allow sufficient time for the page to settle. 2013-03-06 16:36:11 +09:00
Dmitriy Zaporozhets 3a09f02e11 Merge pull request #3109 from hiroponz/improve-network-graph 
Improve network graph
 2013-03-04 23:02:27 -08:00
Sato Hiroyuki 95b826071f Add some tests for network graph 2013-03-04 17:50:42 +09:00
Sato Hiroyuki f8009a4858 Fix spinach errors. 2013-03-01 17:28:29 +09:00
Dmitriy Zaporozhets 00ae65b108 try to use stable version for database cleaner 2013-02-28 21:02:41 +02:00
Dmitriy Zaporozhets e6b5f4ade9 refactor finders in spianch:merge_request.feature 2013-02-28 09:43:48 +02:00
Dmitriy Zaporozhets 2d5096b678 Fix ambiguity for member link in test 2013-02-21 12:39:09 +02:00
Dmitriy Zaporozhets 37187336b1 Team features are green now 2013-02-21 12:27:52 +02:00
Andrew8xx8 ff94f29be5 States events fixed 2013-02-18 16:49:56 +04:00
Andrew8xx8 6074896cbf Spinach tests fixed 2013-02-18 14:43:50 +04:00
Dmitriy Zaporozhets 2af323bbd1 fix active tabs tests 2013-01-31 12:08:56 +02:00
Dmitriy Zaporozhets 8c50707dd4 Merge pull request #2823 from hiroponz/switchable-branch-on-network-graph 
Switchable the main branch on network graph
 2013-01-30 22:21:19 -08:00
Sato Hiroyuki ad33c39800 Fix wrong path of features. 2013-01-31 13:22:08 +09:00
Dmitriy Zaporozhets bfd00caff3 Few usability improvments 2013-01-30 17:13:05 +02:00
GitLab 232d61d598 Refactor project creation. Added logout link to profile page 2013-01-17 17:35:57 +02:00
Dmitriy Zaporozhets cf353bd34f Fixed spinach test 2013-01-15 17:12:53 +02:00
Dmitriy Zaporozhets 953db8477e More fixes for test 2013-01-15 14:28:04 +02:00
Dmitriy Zaporozhets 211c06e419 Fix few test and notify for commit author 2013-01-15 13:37:20 +02:00
Dmitriy Zaporozhets ac983319d3 fixing some test 2013-01-15 12:42:54 +02:00
Riyad Preukschas d28176b132 Replace commit diff note request specs with spinach features 2013-01-15 00:52:57 +01:00
Riyad Preukschas f8e1f4a7c9 Replace commit note request specs with spinach features 2013-01-15 00:52:55 +01:00
Riyad Preukschas 3022786948 Merge commit 'master' into discussions 
Conflicts:
	app/assets/stylesheets/sections/notes.scss
	app/contexts/notes/load_context.rb
	app/models/project.rb
	app/observers/note_observer.rb
	app/roles/votes.rb
	app/views/commit/show.html.haml
	app/views/merge_requests/_show.html.haml
	app/views/merge_requests/diffs.js.haml
	app/views/merge_requests/show.js.haml
	app/views/notes/_note.html.haml
	features/steps/project/project_merge_requests.rb
	spec/models/note_spec.rb
 2013-01-15 00:52:25 +01:00
Dmitriy Zaporozhets 7bfd38eaa9 spinach test: project services 2013-01-09 09:14:05 +03:00
Dmitriy Zaporozhets 2f6603e581 A bit of spinach tests 2013-01-09 08:14:05 +03:00
Dmitriy Zaporozhets fb470e8e2a Validate username uniq in scope of namespace 2013-01-07 17:36:24 +02:00
Dmitriy Zaporozhets a0bd09ab83 Fixed tests 2013-01-07 14:44:57 +02:00
Dmitriy Zaporozhets 68eb394824 Green button when we create new item, blue when save or some primary action 2013-01-06 00:08:02 +02:00
Dmitriy Zaporozhets baf591cc27 Fix network test and snippets expired 2013-01-05 23:49:01 +02:00
Dmitriy Zaporozhets ef5b36eaaf Fixed protected branches and file edit 2013-01-04 21:45:30 +02:00
Dmitriy Zaporozhets afbdbb0c95 Rspec fixes 2013-01-04 18:50:31 +02:00
Dmitriy Zaporozhets dccd8b6eaa Continue refactoring. Use repostory and team 2013-01-04 08:43:25 +02:00
Riyad Preukschas db2c15369c Merge branch 'master' into discussions 
Conflicts:
	app/assets/stylesheets/main.scss
	app/models/project.rb
	app/views/notes/_common_form.html.haml
	app/views/notes/_per_line_form.html.haml
	lib/gitlab/markdown.rb
	spec/models/note_spec.rb
 2012-12-23 01:03:57 +01:00
Dmitriy Zaporozhets 40c6d87175 Merge pull request #2315 from koenpunt/gh-issue-513 
Added compare switch
 2012-12-20 06:15:39 -08:00
Koen Punt 9916e8d6dc Updated test to match with switched commits 
Added compare switch
 2012-12-20 14:39:39 +01:00
Dmitriy Zaporozhets 2f7effe804 Refactor issues, Remove ajax 2012-12-19 06:14:05 +03:00
Riyad Preukschas 0b3df2f128 Add merge request note feature 2012-12-03 22:51:55 +01:00
Dmitriy Zaporozhets 0693215c30 Fixed spinach and tests. Build should pass now 2012-11-23 22:55:38 +02:00
Dmitriy Zaporozhets 9304d049de Fixed some tests and snippet colorize 2012-11-23 22:31:09 +03:00
Dmitriy Zaporozhets c7aeb5127e Fix pre-selected assignee spinach 2012-11-16 13:03:07 +02:00