Commit graph

32 commits

Author SHA1 Message Date
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
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
f8009a4858 Fix spinach errors. 2013-03-01 17:28:29 +09:00
Dmitriy Zaporozhets
3cf814ff9d remove duplicate finder in features/steps/path 2013-02-25 10:28:59 +02:00
Dmitriy Zaporozhets
e6002bdaff Ability to manage and remove group as owner outside of admin area 2013-02-01 19:04:11 +02:00
Sato Hiroyuki
ad33c39800 Fix wrong path of features. 2013-01-31 13:22:08 +09:00
Dmitriy Zaporozhets
d24fd32aa5 feature tests 2013-01-27 15:41:35 +02:00
Dmitriy Zaporozhets
cd47e625f0 Fix features 2013-01-27 14:10:42 +02:00
Andrey Kumanyaev
82499a4cbf Admin teams section added 2013-01-24 22:31:23 +02: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
2f6603e581 A bit of spinach tests 2013-01-09 08:14:05 +03:00
Dmitriy Zaporozhets
dccd8b6eaa Continue refactoring. Use repostory and team 2013-01-04 08:43:25 +02:00
Andrey Kumanyaev
25c5763780 Add functional in user section 2012-12-26 19:52:15 +04:00
Riyad Preukschas
0b3df2f128 Add merge request note feature 2012-12-03 22:51:55 +01:00
Dmitriy Zaporozhets
46bf3a0949 Refactored profile to resource. Added missing flash notice on successfull updated. Update username via ajax 2012-12-02 13:29:24 +02:00
randx
3e04673334 Added feature test for stats 2012-11-10 23:33:10 +02:00
randx
f082c8ae2a Decouple and refactor GraphCommit 2012-11-04 23:43:33 +02:00
Robert Speicher
b1be377fb0 Add Spinach feature for Commit breadcrumbs 2012-11-01 17:57:44 -04:00
Dmitriy Zaporozhets
2032f4cd96 Fix tests fail cause of issue with grit stub 2012-10-31 15:22:13 +02:00
randx
42abdf69d5 More group tests with spinach 2012-10-22 21:42:06 +03:00
randx
db69836319 Move ProjectHooks from spec/requests to spinach 2012-09-27 23:52:08 +03:00
Robert Speicher
b462a13387 Compare views and cleanup
- Remove compare/_head and just use commits/_head since they're identical
- Add index view; extract the form into a partial
2012-09-26 16:32:24 -04:00
Robert Speicher
4252ea90c0 Add feature steps for a generic, non-"Shop" project
This group is better for features that only deal with one project.
2012-09-26 16:32:24 -04:00
Robert Speicher
cada511f8b Add features for checking the "Active Tab" across various pages 2012-09-26 16:32:24 -04:00
Robert Speicher
f814da38bf Limit commit history to 5 in Spinach
Speeds things up a bit
2012-09-26 16:32:23 -04:00
Robert Speicher
1048917232 Update usages of project_commit[s] route helpers 2012-09-26 16:32:23 -04:00
Robert Speicher
79a02df92e Update usages of tree_file_project_ref_path to project_tree_path 2012-09-26 16:32:21 -04:00
Robert Speicher
95bd93fe1a Remove Projects#team action
Uses TeamMembers#index instead, to be more RESTful
2012-09-16 10:07:06 -04:00
Dmitriy Zaporozhets
dc37c8aaae Refactored profile area 2012-09-14 19:13:25 +03:00
Nihad Abbasov
79eb5ab396 refactor feature steps 2012-09-10 08:35:03 -07:00