summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>2015-04-27 18:05:51 +0300
committerDmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>2015-04-27 18:05:51 +0300
commitf21e26966805a24f777352fe441f51db1ba6e96a (patch)
tree0850ea6886ce2d91962e5b487c9f7045edf23fd9
parent278c3ba401efc68b6454abc2d530d813f2a9ffec (diff)
downloadgitlab-ce-f21e26966805a24f777352fe441f51db1ba6e96a.tar.gz
Fix adding new group members from admin area
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
-rw-r--r--CHANGELOG2
-rw-r--r--app/views/admin/groups/show.html.haml2
2 files changed, 2 insertions, 2 deletions
diff --git a/CHANGELOG b/CHANGELOG
index 38dcb7dd227..8b8df0444e0 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -17,7 +17,7 @@ v 7.11.0 (unreleased)
- Add project activity atom feed.
- Don't crash when an MR from a fork has a cross-reference comment from the target project on of its commits.
- Include commit comments in MR from a forked project.
- -
+ - Fix adding new group members from admin area
- Add default project and snippet visibility settings to the admin web UI.
- Fix bug where Slack service channel was not saved in admin template settings. (Stan Hu)
- Move snippets UI to fluid layout
diff --git a/app/views/admin/groups/show.html.haml b/app/views/admin/groups/show.html.haml
index 14996dcd6a2..427f38018b0 100644
--- a/app/views/admin/groups/show.html.haml
+++ b/app/views/admin/groups/show.html.haml
@@ -60,7 +60,7 @@
= form_tag members_update_admin_group_path(@group), id: "new_project_member", class: "bulk_import", method: :put do
%div
- = users_select_tag(:user_ids, multiple: true, email_user: true)
+ = users_select_tag(:user_ids, multiple: true, email_user: true, scope: :all)
%div.prepend-top-10
= select_tag :access_level, options_for_select(GroupMember.access_level_roles), class: "project-access-select select2"
%hr