diff options
| author | Dmitriy Zaporozhets <dzaporozhets@gitlab.com> | 2015-04-28 08:31:48 +0000 |
|---|---|---|
| committer | Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> | 2015-05-06 14:41:41 +0300 |
| commit | 8ef84b3e5c957cec1cf0ea083c0920294daa42d4 (patch) | |
| tree | 251ab0a8c6ba79d2194c5afd4e779b767fdc7dcc | |
| parent | d4516cf5cd55b6f6f36451548eeaead0bde23a88 (diff) | |
| download | gitlab-ce-8ef84b3e5c957cec1cf0ea083c0920294daa42d4.tar.gz | |
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
| -rw-r--r-- | CHANGELOG | 15 | ||||
| -rw-r--r-- | app/views/admin/groups/show.html.haml | 2 |
2 files changed, 16 insertions, 1 deletions
diff --git a/CHANGELOG b/CHANGELOG index 97e2827989c..2c4af5362de 100644 --- a/CHANGELOG +++ b/CHANGELOG @@ -13,6 +13,21 @@ v 7.11.0 (unreleased) - v 7.10.0 (unreleased) + - Show Atom feed buttons everywhere where applicable. + - 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 + - Improve UI for sidebar. Increase separation between navigation and content + - Improve new project command options (Ben Bodenmiller) + - Prevent sending empty messages to HipChat (Chulki Lee) + - Improve UI for mobile phones on dashboard and project pages + - Add room notification and message color option for HipChat + +v 7.10.0 - Ignore submodules that are defined in .gitmodules but are checked in as directories. - Allow projects to be imported from Google Code. - Remove access control for uploaded images to fix broken images in emails (Hannes Rosenögger) 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 |