Robert Speicher and Yorick Peterse
aa664af3dd
Merge branch '15527-fix-wiki-page-creation-issue' into 'master'
...
Fix error when trying to create a wiki page
Closes #15527 , #15569 , #15623 , #15630 , #15637 , #15653 , #15870 , #16558 , #16875 , #16987 , #17016 , https://github.com/gitlabhq/gitlabhq/issues/10317 .
See merge request !3924
2016-05-03 09:42:16 +00:00
Robert Speicher and Yorick Peterse
009e2ed1c7
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-25 21:52:54 +02:00
Robert Speicher and Yorick Peterse
777a8b2af5
Merge branch 'fix/cherry-pick-specs-location' into 'master'
...
Move cherry-pick feature specs to proper directory
Cherry pick feature specs were located in `spec/feature/project` directory while we have `spec/feature/projects`.
Later location is consistent with our namespaces (we have `Projects::` namespace, not `Project::`).
See merge request !3875
2016-04-25 19:49:39 +00:00
Robert Speicher and Yorick Peterse
69821f1a01
Merge branch 'license-templates-and-api-12804' into 'master'
...
License templates when creating/editing a LICENSE file
Closes #12804
See merge request !3660
2016-04-20 10:50:27 +02:00
Grzegorz Bizon
7640b050c0
Add feature specs for list of badges page
2016-04-06 19:56:34 +02:00
Robert SpeicherandYorick Peterse
Grzegorz Bizon