diff options
author | Fatih Acet <acetfatih@gmail.com> | 2016-10-14 15:25:23 +0300 |
---|---|---|
committer | Fatih Acet <acetfatih@gmail.com> | 2016-10-14 15:25:23 +0300 |
commit | 66855f62622e9fb87ae12de53c7912c4b79baa47 (patch) | |
tree | c61c2e1bfc4e13db98db59f28865d866ebb1e613 /app/assets/javascripts/dispatcher.js | |
parent | fd2b79b6646f9b621a5e30058a09423a8cdb6c49 (diff) | |
parent | 9ec7aeac2362151e15e59531f347f2d7924437f8 (diff) |
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 'app/assets/javascripts/dispatcher.js')
-rw-r--r-- | app/assets/javascripts/dispatcher.js | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/app/assets/javascripts/dispatcher.js b/app/assets/javascripts/dispatcher.js index f3ef13ce20e..858621218f8 100644 --- a/app/assets/javascripts/dispatcher.js +++ b/app/assets/javascripts/dispatcher.js @@ -140,12 +140,12 @@ break; case 'groups:group_members:index': new gl.MemberExpirationDate(); - new GroupMembers(); + new gl.Members(); new UsersSelect(); break; case 'projects:project_members:index': new gl.MemberExpirationDate(); - new ProjectMembers(); + new gl.Members(); new UsersSelect(); break; case 'groups:new': |