summaryrefslogtreecommitdiff
path: root/lib/api/files.rb
diff options
context:
space:
mode:
authorFatih Acet <acetfatih@gmail.com>2016-12-09 18:11:47 +0000
committerFatih Acet <acetfatih@gmail.com>2016-12-09 18:11:47 +0000
commit5bb43bb9531422545f974df8a6cf5616b7631f51 (patch)
tree9a38a0888f498def6d26a5ee590963509a1085bd /lib/api/files.rb
parentb546fd7bba7434c787debb92e944b34420a0ee4c (diff)
parentfcf332a4fa544d4a5eba200878a7b9298e5b6f6b (diff)
downloadgitlab-ce-5bb43bb9531422545f974df8a6cf5616b7631f51.tar.gz
Merge branch 'members-dropdowns' into 'master'
Updated members dropdowns ## What does this MR do? EE has different dropdowns to allow for group LDAP members to be overridden, this ports the dropdown changes over to reduce conflicts. ## Screenshots (if relevant) ![Screen_Shot_2016-12-07_at_15.28.20](/uploads/6cb6def34015b024dc878aa3b99be4a0/Screen_Shot_2016-12-07_at_15.28.20.png) See merge request !7974
Diffstat (limited to 'lib/api/files.rb')
0 files changed, 0 insertions, 0 deletions