diff options
| author | Drew Blessing <drew@blessing.io> | 2016-01-13 20:58:39 +0300 |
|---|---|---|
| committer | Drew Blessing <drew@blessing.io> | 2016-01-13 20:58:39 +0300 |
| commit | 5df760a2c2265bd2b40ea0dd22a5f15d76f848c7 (patch) | |
| tree | 851415031411ca1b32b3224979ad589715eeb97a | |
| parent | b7f49aa0f0cbcd699396799fd746fa4f5735a250 (diff) | |
| parent | 76b3ca72053633a17bba2f8a21f1672a88af3765 (diff) | |
Merge branch 'user-search-hint' into 'master'
Added hint that you can search users by name, username, or email.
Fixes gitlab-org/gitlab-ee#19
/cc @JobV
See merge request !2411
| -rw-r--r-- | app/views/groups/group_members/_new_group_member.html.haml | 2 | ||||
| -rw-r--r-- | app/views/projects/project_members/_new_project_member.html.haml | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/app/views/groups/group_members/_new_group_member.html.haml b/app/views/groups/group_members/_new_group_member.html.haml index 3361d7e2a8d..e7ab4f2409b 100644 --- a/app/views/groups/group_members/_new_group_member.html.haml +++ b/app/views/groups/group_members/_new_group_member.html.haml @@ -4,7 +4,7 @@ .col-sm-10 = users_select_tag(:user_ids, multiple: true, class: 'input-large', scope: :all, email_user: true) .help-block - Search for existing users or invite new ones using their email address. + Search for users by name, username, or email, or invite new ones using their email address. .form-group = f.label :access_level, "Group Access", class: 'control-label' diff --git a/app/views/projects/project_members/_new_project_member.html.haml b/app/views/projects/project_members/_new_project_member.html.haml index d708b01a114..f0f3bb3c177 100644 --- a/app/views/projects/project_members/_new_project_member.html.haml +++ b/app/views/projects/project_members/_new_project_member.html.haml @@ -4,7 +4,7 @@ .col-sm-10 = users_select_tag(:user_ids, multiple: true, class: 'input-large', scope: :all, email_user: true) .help-block - Search for existing users or invite new ones using their email address. + Search for users by name, username, or email, or invite new ones using their email address. .form-group = f.label :access_level, "Project Access", class: 'control-label' |