diff options
author | Sean McGivern <sean@mcgivern.me.uk> | 2016-10-13 14:21:14 +0000 |
---|---|---|
committer | Sean McGivern <sean@mcgivern.me.uk> | 2016-10-13 14:21:14 +0000 |
commit | 11e93ad59d6209bf9805a6f7053719e8052cc508 (patch) | |
tree | 0770038bcfb327e45381e8f45ba6629c02a09f12 /config | |
parent | 36dafbbb02201ad36ca7e59f699cbf727494129e (diff) | |
parent | 25c82c6faf067a82e99bad590357ad57618475d9 (diff) | |
download | gitlab-ce-11e93ad59d6209bf9805a6f7053719e8052cc508.tar.gz |
Merge branch 'feature/issues-board' into 'master'
Refactoring Issues Board
## What does this MR do?
This MR aims to minimize conflicts between the CE issues board feature with EE multiple boards feature.
## Are there points in the code the reviewer needs to double check?
## Why was this MR needed?
To avoid a lot of conflicts with EE multiple boards feature.
## Screenshots (if relevant)
## Does this MR meet the acceptance criteria?
- [ ] ~~[CHANGELOG](https://gitlab.com/gitlab-org/gitlab-ce/blob/master/CHANGELOG) entry added~~
- [ ] ~~[Documentation created/updated](https://gitlab.com/gitlab-org/gitlab-ce/blob/master/doc/development/doc_styleguide.md)~~
- [x] API support added
- Tests
- [X] Added for this feature/bug
- [ ] All builds are passing
- [x] Conform by the [merge request performance guides](http://docs.gitlab.com/ce/development/merge_request_performance_guidelines.html)
- [X] Conform by the [style guides](https://gitlab.com/gitlab-org/gitlab-ce/blob/master/CONTRIBUTING.md#style-guides)
- [ ] Branch has no merge conflicts with `master` (if you do - rebase it please)
- [x] [Squashed related commits together](https://git-scm.com/book/en/Git-Tools-Rewriting-History#Squashing-Commits)
## What are the relevant issue numbers?
https://gitlab.com/gitlab-org/gitlab-ee/issues/929
https://gitlab.com/gitlab-org/gitlab-ee/issues/1084
See merge request !6727
Diffstat (limited to 'config')
-rw-r--r-- | config/routes/project.rb | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/config/routes/project.rb b/config/routes/project.rb index dd0e84b1475..f9d58f5d5b2 100644 --- a/config/routes/project.rb +++ b/config/routes/project.rb @@ -417,7 +417,7 @@ resources :namespaces, path: '/', constraints: { id: /[a-zA-Z.0-9_\-]+/ }, only: end end - resource :board, only: [:show] do + resources :boards, only: [:index, :show] do scope module: :boards do resources :issues, only: [:update] |