Commit Graph
16 Commits
Author SHA1 Message Date
James Lopez 14dd2d4ad0 fixed import file spec 2016-05-04 15:05:28 +02:00
James Lopez b69c8c280c fixing some export issues in spec 2016-05-03 15:07:05 +02:00
James Lopez 3929972d90 Merge branch 'feature/project-import' of gitlab.com:gitlab-org/gitlab-ce into feature/project-export-ui-experimental
# Conflicts:
#	app/controllers/import/gitlab_project_controller.rb
2016-05-03 13:14:31 +02:00
Rémy Coutable f1e74de47c Simplify specs by not over-expecting
Signed-off-by: Rémy Coutable <remy@rymai.me>
2016-05-02 18:34:14 +02:00
James Lopez b5f2a7e139 fixed integration test 2016-05-02 11:58:35 +02:00
James Lopez 07ab6c2e26 refactoring and fixing a bunch of stuff 2016-05-02 11:29:21 +02:00
Rémy CoutableandStan Hu 3811eb0ba1 Fix error when trying to create a wiki page
Closes #15527.

Signed-off-by: Rémy Coutable <remy@rymai.me>
2016-04-29 06:50:18 -07:00
James Lopez 7ebf22e002 more refactoring and fixes - fixing spec as well 2016-04-29 15:15:27 +02:00
James Lopez c46f3bcb51 few fixes and new integration spec -WIP 2016-04-29 13:11:07 +02:00
Grzegorz Bizon ef032bb9f1 Fix error on commit builds page when no builds yet
Closes #15509
2016-04-25 17:19:57 +02:00
Robert Speicher 84d3649d57 Merge branch '15513-fix-undefined-can-method' into 'master'
Use the `can?` helper instead of `current_user.can?`

Fixes #15513.

See merge request !3882
2016-04-22 17:38:10 +00:00
Rémy Coutable 951e3459e1 Use the can? helper instead of current_user.can?
Fixes #15513.

Signed-off-by: Rémy Coutable <remy@rymai.me>
2016-04-22 15:48:58 +02:00
Grzegorz Bizon b711fc0abd Move cherry-pick feature specs to proper directory 2016-04-22 13:34:03 +02:00
Rémy Coutable b2370fefad Fix specs
Signed-off-by: Rémy Coutable <remy@rymai.me>
2016-04-18 14:47:50 +02:00
Rémy Coutable 13804aba86 Continue implementation of the license template selector and /licenses API endpoint
Signed-off-by: Rémy Coutable <remy@rymai.me>
2016-04-18 14:47:50 +02:00
Grzegorz Bizon 7640b050c0 Add feature specs for list of badges page 2016-04-06 19:56:34 +02:00