summaryrefslogtreecommitdiff
path: root/app/assets
diff options
context:
space:
mode:
authorPhil Hughes <me@iamphill.com>2018-11-07 11:24:36 +0000
committerPhil Hughes <me@iamphill.com>2018-11-07 11:24:36 +0000
commite7df959b8f99875edd246c7ac7779c3203e8755e (patch)
treeb3d26774176e1f9aa6a1d576ce76312e391ab4fe /app/assets
parent4a5d04fb3f73ab1e77978b5d13538747846db761 (diff)
parent28840d3f5ce50552dfdfefecedf6c5d631848c86 (diff)
downloadgitlab-ce-e7df959b8f99875edd246c7ac7779c3203e8755e.tar.gz
Merge branch 'copy-changes-for-abuse-clarity' into 'master'
Copy changes for abuse clarity Closes #51589 See merge request gitlab-org/gitlab-ce!22148
Diffstat (limited to 'app/assets')
-rw-r--r--app/assets/javascripts/notes/components/note_actions.vue6
1 files changed, 3 insertions, 3 deletions
diff --git a/app/assets/javascripts/notes/components/note_actions.vue b/app/assets/javascripts/notes/components/note_actions.vue
index dbd394ee6f2..01cbe40f444 100644
--- a/app/assets/javascripts/notes/components/note_actions.vue
+++ b/app/assets/javascripts/notes/components/note_actions.vue
@@ -248,7 +248,7 @@ export default {
<ul class="dropdown-menu more-actions-dropdown dropdown-open-left">
<li v-if="canReportAsAbuse">
<a :href="reportAbusePath">
- Report as abuse
+ {{ __('Report abuse to GitLab') }}
</a>
</li>
<li v-if="noteUrl">
@@ -257,7 +257,7 @@ export default {
type="button"
class="btn-default btn-transparent js-btn-copy-note-link"
>
- Copy link
+ {{ __('Copy link') }}
</button>
</li>
<li v-if="canEdit">
@@ -266,7 +266,7 @@ export default {
type="button"
@click.prevent="onDelete">
<span class="text-danger">
- Delete comment
+ {{ __('Delete comment') }}
</span>
</button>
</li>