diff options
| author | Filipa Lacerda <filipa@gitlab.com> | 2019-06-06 10:05:42 +0000 |
|---|---|---|
| committer | Filipa Lacerda <filipa@gitlab.com> | 2019-06-06 10:05:42 +0000 |
| commit | 26d57f96410d474dff2e57b31cdd47764ff7b05b (patch) | |
| tree | 882066bb669ebc07c81ec8609b189814aaf04dcc /app | |
| parent | e53f475e4a6aaaee526e95c2e922e87b4ef98d32 (diff) | |
| parent | 982463e944e0af140dc31c8e64a995b476294e82 (diff) | |
| download | gitlab-ce-26d57f96410d474dff2e57b31cdd47764ff7b05b.tar.gz | |
Merge branch '59376-Report-abuse-to-GitLab-should-be-Report-abuse-in-non-gitlab.com-instances' into 'master'
Change "Report abuse to GitLab" to more generic wording.
Closes #59376
See merge request gitlab-org/gitlab-ce!28884
Diffstat (limited to 'app')
| -rw-r--r-- | app/assets/javascripts/notes/components/note_actions.vue | 2 | ||||
| -rw-r--r-- | app/views/abuse_reports/new.html.haml | 8 | ||||
| -rw-r--r-- | app/views/projects/notes/_more_actions_dropdown.html.haml | 2 |
3 files changed, 6 insertions, 6 deletions
diff --git a/app/assets/javascripts/notes/components/note_actions.vue b/app/assets/javascripts/notes/components/note_actions.vue index c9c40cb6acf..844d0c3e376 100644 --- a/app/assets/javascripts/notes/components/note_actions.vue +++ b/app/assets/javascripts/notes/components/note_actions.vue @@ -195,7 +195,7 @@ export default { </button> <ul class="dropdown-menu more-actions-dropdown dropdown-open-left"> <li v-if="canReportAsAbuse"> - <a :href="reportAbusePath">{{ __('Report abuse to GitLab') }}</a> + <a :href="reportAbusePath">{{ __('Report abuse to admin') }}</a> </li> <li v-if="noteUrl"> <button diff --git a/app/views/abuse_reports/new.html.haml b/app/views/abuse_reports/new.html.haml index a161fbd064e..c6781e91cfd 100644 --- a/app/views/abuse_reports/new.html.haml +++ b/app/views/abuse_reports/new.html.haml @@ -1,10 +1,10 @@ -- page_title _("Report abuse to GitLab") +- page_title _("Report abuse to admin") %h3.page-title - = _("Report abuse to GitLab") + = _("Report abuse to admin") %p - = _("Please use this form to report users to GitLab who create spam issues, comments or behave inappropriately.") + = _("Please use this form to report to the admin users who create spam issues, comments or behave inappropriately.") %p - = _("A member of GitLab's abuse team will review your report as soon as possible.") + = _("A member of the abuse team will review your report as soon as possible.") %hr = form_for @abuse_report, html: { class: 'js-quick-submit js-requires-input'} do |f| = form_errors(@abuse_report) diff --git a/app/views/projects/notes/_more_actions_dropdown.html.haml b/app/views/projects/notes/_more_actions_dropdown.html.haml index 8de84f82e9f..8a6e5fde99b 100644 --- a/app/views/projects/notes/_more_actions_dropdown.html.haml +++ b/app/views/projects/notes/_more_actions_dropdown.html.haml @@ -11,7 +11,7 @@ - unless is_current_user %li = link_to new_abuse_report_path(user_id: note.author.id, ref_url: noteable_note_url(note)) do - = _('Report abuse to GitLab') + = _('Report abuse to admin') - if note_editable %li = link_to note_url(note), method: :delete, data: { confirm: 'Are you sure you want to delete this comment?' }, remote: true, class: 'js-note-delete' do |