diff options
| author | Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> | 2016-03-14 16:38:52 +0000 |
|---|---|---|
| committer | Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> | 2016-03-14 16:38:52 +0000 |
| commit | d324bf84340b58452181eeadb68c64d1888b3f9e (patch) | |
| tree | a10cfbb93aabd424d7d89edde73de41f44857f6e /config | |
| parent | d213758a9a8cee4f654fce9702e3954786961fae (diff) | |
| parent | e8b3b92ddebc47595fe4b69dc5b5a3a6dd1365ab (diff) | |
| download | gitlab-ce-d324bf84340b58452181eeadb68c64d1888b3f9e.tar.gz | |
Merge branch 'share-project-ce' into 'master'
Bring from EE: Share Project with Group
- [x] Models and migrations
- [x] Logic, UI
- [x] Tests
- [x] Documentation
- [x] Share with group lock
- [x] Api feature
- [x] Api docs
- [x] Api tests
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
For #12831
cc @DouweM @rspeicher @vsizov
See merge request !3186
Diffstat (limited to 'config')
| -rw-r--r-- | config/routes.rb | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/config/routes.rb b/config/routes.rb index 869fca03ec4..536397e318a 100644 --- a/config/routes.rb +++ b/config/routes.rb @@ -701,6 +701,8 @@ Rails.application.routes.draw do end end + resources :group_links, only: [:index, :create, :destroy], constraints: { id: /\d+/ } + resources :notes, only: [:index, :create, :destroy, :update], constraints: { id: /\d+/ } do member do delete :delete_attachment |