diff options
| author | Tim Zallmann <tzallmann@gitlab.com> | 2019-08-14 08:07:43 +0000 |
|---|---|---|
| committer | Tim Zallmann <tzallmann@gitlab.com> | 2019-08-14 08:07:43 +0000 |
| commit | 94cf543fe3909a0a12771765a85c3c596f318046 (patch) | |
| tree | 0d2d2f09c694a400050bdafeaa02669d2895c848 | |
| parent | a9d18ba85832dacfd8c6edab3d704d7ae042c102 (diff) | |
| parent | eda86f57b68264b289617ca46fa513600b7307b0 (diff) | |
| download | gitlab-ce-94cf543fe3909a0a12771765a85c3c596f318046.tar.gz | |
Merge branch '10-adjust-copy-for-adding-additional-members' into 'master'
Adjust copy for adding additional members
See merge request gitlab-org/gitlab-ce!31726
| -rw-r--r-- | app/views/projects/project_members/_new_project_member.html.haml | 2 | ||||
| -rw-r--r-- | changelogs/unreleased/10-adjust-copy-for-adding-additional-members.yml | 5 | ||||
| -rw-r--r-- | locale/gitlab.pot | 6 |
3 files changed, 9 insertions, 4 deletions
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 efabb7f7b19..149b0d6cddd 100644 --- a/app/views/projects/project_members/_new_project_member.html.haml +++ b/app/views/projects/project_members/_new_project_member.html.haml @@ -2,7 +2,7 @@ .col-sm-12 = form_for @project_member, as: :project_member, url: project_project_members_path(@project), html: { class: 'users-project-form' } do |f| .form-group - = label_tag :user_ids, _("Select members to invite"), class: "label-bold" + = label_tag :user_ids, _("GitLab member or Email address"), class: "label-bold" = users_select_tag(:user_ids, multiple: true, class: "input-clamp qa-member-select-input", scope: :all, email_user: true, placeholder: "Search for members to update or invite") .form-group = label_tag :access_level, _("Choose a role permission"), class: "label-bold" diff --git a/changelogs/unreleased/10-adjust-copy-for-adding-additional-members.yml b/changelogs/unreleased/10-adjust-copy-for-adding-additional-members.yml new file mode 100644 index 00000000000..f249eff572c --- /dev/null +++ b/changelogs/unreleased/10-adjust-copy-for-adding-additional-members.yml @@ -0,0 +1,5 @@ +--- +title: Adjust copy for adding additional members +merge_request: 31726 +author: +type: changed diff --git a/locale/gitlab.pot b/locale/gitlab.pot index 27435576495..63882d94726 100644 --- a/locale/gitlab.pot +++ b/locale/gitlab.pot @@ -5215,6 +5215,9 @@ msgstr "" msgid "GitLab User" msgstr "" +msgid "GitLab member or Email address" +msgstr "" + msgid "GitLab project export" msgstr "" @@ -9912,9 +9915,6 @@ msgstr "" msgid "Select branch/tag" msgstr "" -msgid "Select members to invite" -msgstr "" - msgid "Select merge moment" msgstr "" |