Merge branch 'admin-add-group-members' into 'master'

Fix adding new group members from admin area Fix for #2222 Tests for this case already exists but it was green. It related to current way dealing with ajax selectbox. Improving tests might be a reason for another merge requests - everyone is welcome to participate. See merge request !1796

Merge branch 'admin-add-group-members' into 'master'
2940de43 · Dmitriy Zaporozhets · c505eda3 · f21e2696 · 2940de43 · 2940de43
Commit 2940de43 authored Apr 28, 2015 by Dmitriy Zaporozhets
Hide whitespace changes
Inline Side-by-side

Showing with 2 additions and 2 deletions

CHANGELOG CHANGELOG +1 -1

show.html.haml app/views/admin/groups/show.html.haml +1 -1

No files found.
--- 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

--- 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