Change "Report abuse to GitLab" to more generic wording.
This commit is contained in:
parent
e53f475e4a
commit
982463e944
|
@ -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
|
||||
|
|
|
@ -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)
|
||||
|
|
|
@ -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
|
||||
|
|
|
@ -0,0 +1,5 @@
|
|||
---
|
||||
title: Change "Report abuse to GitLab" to more generic wording
|
||||
merge_request: 28884
|
||||
author: Marc Schwede
|
||||
type: other
|
|
@ -427,7 +427,7 @@ msgstr ""
|
|||
msgid "A fork is a copy of a project.<br />Forking a repository allows you to make changes without affecting the original project."
|
||||
msgstr ""
|
||||
|
||||
msgid "A member of GitLab's abuse team will review your report as soon as possible."
|
||||
msgid "A member of the abuse team will review your report as soon as possible."
|
||||
msgstr ""
|
||||
|
||||
msgid "A new branch will be created in your fork and a new merge request will be started."
|
||||
|
@ -7315,7 +7315,7 @@ msgstr ""
|
|||
msgid "Please try again"
|
||||
msgstr ""
|
||||
|
||||
msgid "Please use this form to report users to GitLab who create spam issues, comments or behave inappropriately."
|
||||
msgid "Please use this form to report to the admin users who create spam issues, comments or behave inappropriately."
|
||||
msgstr ""
|
||||
|
||||
msgid "Please wait a moment, this page will automatically refresh when ready."
|
||||
|
@ -8385,7 +8385,7 @@ msgstr ""
|
|||
msgid "Reply to this email directly or %{view_it_on_gitlab}."
|
||||
msgstr ""
|
||||
|
||||
msgid "Report abuse to GitLab"
|
||||
msgid "Report abuse to admin"
|
||||
msgstr ""
|
||||
|
||||
msgid "Reporting"
|
||||
|
|
|
@ -66,7 +66,7 @@ describe('noteActions', () => {
|
|||
expect(wrapper.find('.js-note-edit').exists()).toBe(true);
|
||||
});
|
||||
|
||||
it('should be possible to report abuse to GitLab', () => {
|
||||
it('should be possible to report abuse to admin', () => {
|
||||
expect(wrapper.find(`a[href="${props.reportAbusePath}"]`).exists()).toBe(true);
|
||||
});
|
||||
|
||||
|
|
|
@ -20,7 +20,7 @@ shared_examples 'reportable note' do |type|
|
|||
dropdown = comment.find(more_actions_selector)
|
||||
open_dropdown(dropdown)
|
||||
|
||||
expect(dropdown).to have_link('Report abuse to GitLab', href: abuse_report_path)
|
||||
expect(dropdown).to have_link('Report abuse to admin', href: abuse_report_path)
|
||||
|
||||
if type == 'issue' || type == 'merge_request'
|
||||
expect(dropdown).to have_button('Delete comment')
|
||||
|
@ -33,7 +33,7 @@ shared_examples 'reportable note' do |type|
|
|||
dropdown = comment.find(more_actions_selector)
|
||||
open_dropdown(dropdown)
|
||||
|
||||
dropdown.click_link('Report abuse to GitLab')
|
||||
dropdown.click_link('Report abuse to admin')
|
||||
|
||||
expect(find('#user_name')['value']).to match(note.author.username)
|
||||
expect(find('#abuse_report_message')['value']).to match(noteable_note_url(note))
|
||||
|
|
|
@ -12,10 +12,10 @@ describe 'projects/notes/_more_actions_dropdown' do
|
|||
assign(:project, project)
|
||||
end
|
||||
|
||||
it 'shows Report abuse to GitLab button if not editable and not current users comment' do
|
||||
it 'shows Report abuse to admin button if not editable and not current users comment' do
|
||||
render 'projects/notes/more_actions_dropdown', current_user: not_author_user, note_editable: false, note: note
|
||||
|
||||
expect(rendered).to have_link('Report abuse to GitLab')
|
||||
expect(rendered).to have_link('Report abuse to admin')
|
||||
end
|
||||
|
||||
it 'does not show the More actions button if not editable and current users comment' do
|
||||
|
@ -24,10 +24,10 @@ describe 'projects/notes/_more_actions_dropdown' do
|
|||
expect(rendered).not_to have_selector('.dropdown.more-actions')
|
||||
end
|
||||
|
||||
it 'shows Report abuse to GitLab and Delete buttons if editable and not current users comment' do
|
||||
it 'shows Report abuse to admin and Delete buttons if editable and not current users comment' do
|
||||
render 'projects/notes/more_actions_dropdown', current_user: not_author_user, note_editable: true, note: note
|
||||
|
||||
expect(rendered).to have_link('Report abuse to GitLab')
|
||||
expect(rendered).to have_link('Report abuse to admin')
|
||||
expect(rendered).to have_link('Delete comment')
|
||||
end
|
||||
|
||||
|
|
Loading…
Reference in New Issue