diff options
author | Fatih Acet <acetfatih@gmail.com> | 2016-10-14 12:25:23 +0000 |
---|---|---|
committer | Fatih Acet <acetfatih@gmail.com> | 2016-10-14 12:25:23 +0000 |
commit | 66855f62622e9fb87ae12de53c7912c4b79baa47 (patch) | |
tree | c61c2e1bfc4e13db98db59f28865d866ebb1e613 /config | |
parent | fd2b79b6646f9b621a5e30058a09423a8cdb6c49 (diff) | |
parent | 9ec7aeac2362151e15e59531f347f2d7924437f8 (diff) | |
download | gitlab-ce-66855f62622e9fb87ae12de53c7912c4b79baa47.tar.gz |
Merge branch 'members-ui' into 'master'
Project members UI
## What does this MR do?
New UI for project members that includes groups.
## Screenshots (if relevant)
### Project members
![Screen_Shot_2016-09-02_at_15.13.27](/uploads/b9d4a634d44b7b7bbb6eddb10aee86bd/Screen_Shot_2016-09-02_at_15.13.27.png)
### Group members
![Screen_Shot_2016-09-02_at_15.13.36](/uploads/c15c173e68b2c0b49bcd06ca560269d3/Screen_Shot_2016-09-02_at_15.13.36.png)
## What are the relevant issue numbers?
Part of #19868
Closes #21320
See merge request !6148
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 200922b74db..2cd8c60794a 100644 --- a/config/routes/project.rb +++ b/config/routes/project.rb @@ -408,7 +408,7 @@ resources :namespaces, path: '/', constraints: { id: /[a-zA-Z.0-9_\-]+/ }, only: end end - resources :group_links, only: [:index, :create, :destroy], constraints: { id: /\d+/ } + resources :group_links, only: [:index, :create, :update, :destroy], constraints: { id: /\d+/ } resources :notes, only: [:index, :create, :destroy, :update], concerns: :awardable, constraints: { id: /\d+/ } do member do |