diff options
author | Phil Hughes <me@iamphill.com> | 2019-07-09 10:43:39 +0300 |
---|---|---|
committer | Phil Hughes <me@iamphill.com> | 2019-07-09 10:43:39 +0300 |
commit | da642f80820eb5604684d8fcbb99a69cadd3b84e (patch) | |
tree | 84b980db4d6344804db65032b6ccb9b8ff6895f1 | |
parent | 6deaf3b9b6fbc5bbae3d51da4cd77467002457a5 (diff) | |
parent | f47ad4d640fd80481a986c8ed7f9665069bbfbfb (diff) |
Merge branch 'pb-fix-confidential-mr-dropdown-typo' into 'master'
Fix typo on confidential MR dropdown
See merge request gitlab-org/gitlab-ce!30499
3 files changed, 6 insertions, 6 deletions
diff --git a/app/assets/javascripts/confidential_merge_request/components/project_form_group.vue b/app/assets/javascripts/confidential_merge_request/components/project_form_group.vue index b89729375be..29d2cca6aed 100644 --- a/app/assets/javascripts/confidential_merge_request/components/project_form_group.vue +++ b/app/assets/javascripts/confidential_merge_request/components/project_form_group.vue @@ -41,7 +41,7 @@ export default { noForkText() { return sprintf( __( - 'To protect this issues confidentiality, %{link_start}fork the project%{link_end} and set the forks visiblity to private.', + "To protect this issue's confidentiality, %{link_start}fork the project%{link_end} and set the forks visiblity to private.", ), { link_start: `<a href="${this.newForkPath}" class="help-link">`, link_end: '</a>' }, false, @@ -118,7 +118,7 @@ export default { <template v-if="projects.length"> {{ __( - 'To protect this issues confidentiality, a private fork of this project was selected.', + "To protect this issue's confidentiality, a private fork of this project was selected.", ) }} </template> diff --git a/locale/gitlab.pot b/locale/gitlab.pot index 07534e9c941..f1cfb0ac06d 100644 --- a/locale/gitlab.pot +++ b/locale/gitlab.pot @@ -11224,10 +11224,10 @@ msgstr "" msgid "To preserve performance only <strong>%{display_size} of %{real_size}</strong> files are displayed." msgstr "" -msgid "To protect this issues confidentiality, %{link_start}fork the project%{link_end} and set the forks visiblity to private." +msgid "To protect this issue's confidentiality, %{link_start}fork the project%{link_end} and set the forks visiblity to private." msgstr "" -msgid "To protect this issues confidentiality, a private fork of this project was selected." +msgid "To protect this issue's confidentiality, a private fork of this project was selected." msgstr "" msgid "To see all the user's personal access tokens you must impersonate them first." diff --git a/spec/frontend/confidential_merge_request/components/__snapshots__/project_form_group_spec.js.snap b/spec/frontend/confidential_merge_request/components/__snapshots__/project_form_group_spec.js.snap index a241c764df7..ba0ee8dfd59 100644 --- a/spec/frontend/confidential_merge_request/components/__snapshots__/project_form_group_spec.js.snap +++ b/spec/frontend/confidential_merge_request/components/__snapshots__/project_form_group_spec.js.snap @@ -19,7 +19,7 @@ exports[`Confidential merge request project form group component renders empty s <br /> <span> - To protect this issues confidentiality, + To protect this issue's confidentiality, <a class="help-link" href="https://test.com" @@ -69,7 +69,7 @@ exports[`Confidential merge request project form group component renders fork dr <br /> <span> - To protect this issues confidentiality, + To protect this issue's confidentiality, <a class="help-link" href="https://test.com" |