Skip to content
Snippets Groups Projects
Commit 49d7e833 authored by Mark Chao's avatar Mark Chao :two:
Browse files

Rephrase "maintainer" to more precise "members who can merge to the target branch"

"Maintainer" will be freed to be used for #42751
parent 40683268
No related branches found
No related tags found
Loading
......@@ -14,7 +14,7 @@
<template>
<section class="mr-info-list mr-links">
<p v-if="maintainerEditAllowed">
{{ s__("mrWidget|Allows edits from maintainers") }}
{{ s__("mrWidget|Allows commits from members who can merge to the target branch") }}
</p>
</section>
</template>
......@@ -14,7 +14,7 @@
.checkbox
= form.label :allow_maintainer_to_push do
= form.check_box :allow_maintainer_to_push, disabled: !issuable.can_allow_maintainer_to_push?(current_user)
= _('Allow edits from maintainers.')
= _('Allow commits from members who can merge to the target branch.')
= link_to 'About this feature', help_page_path('user/project/merge_requests/maintainer_access')
.help-block
= allow_maintainer_push_unavailable_reason(issuable)
......@@ -291,7 +291,7 @@ msgstr ""
msgid "All features are enabled for blank projects, from templates, or when importing, but you can disable them afterward in the project settings."
msgstr ""
msgid "Allow edits from maintainers."
msgid "Allow commits from members who can merge to the target branch."
msgstr ""
msgid "Allow rendering of PlantUML diagrams in Asciidoc documents."
......@@ -4593,7 +4593,7 @@ msgstr ""
msgid "mrWidget|%{metricsLinkStart} Memory %{metricsLinkEnd} usage is %{emphasisStart} unchanged %{emphasisEnd} at %{memoryFrom}MB"
msgstr ""
msgid "mrWidget|Allows edits from maintainers"
msgid "mrWidget|Allows commits from members who can merge to the target branch"
msgstr ""
msgid "mrWidget|Cancel automatic merge"
......
require 'spec_helper'
describe 'create a merge request that allows maintainers to push', :js do
describe 'create a merge request, allowing commits from members who can merge to the target branch', :js do
include ProjectForksHelper
let(:user) { create(:user) }
let(:target_project) { create(:project, :public, :repository) }
......@@ -21,16 +21,16 @@ def visit_new_merge_request
sign_in(user)
end
it 'allows setting maintainer push possible' do
it 'allows setting possible' do
visit_new_merge_request
check 'Allow edits from maintainers'
check 'Allow commits from members who can merge to the target branch'
click_button 'Submit merge request'
wait_for_requests
expect(page).to have_content('Allows edits from maintainers')
expect(page).to have_content('Allows commits from members who can merge to the target branch')
end
it 'shows a message when one of the projects is private' do
......@@ -57,12 +57,12 @@ def visit_new_merge_request
visit_new_merge_request
expect(page).not_to have_content('Allows edits from maintainers')
expect(page).not_to have_content('Allows commits from members who can merge to the target branch')
end
end
context 'when a maintainer tries to edit the option' do
let(:maintainer) { create(:user) }
context 'when a member who can merge tries to edit the option' do
let(:member) { create(:user) }
let(:merge_request) do
create(:merge_request,
source_project: source_project,
......@@ -71,15 +71,15 @@ def visit_new_merge_request
end
before do
target_project.add_master(maintainer)
target_project.add_master(member)
sign_in(maintainer)
sign_in(member)
end
it 'it hides the option from maintainers' do
it 'it hides the option from members' do
visit edit_project_merge_request_path(target_project, merge_request)
expect(page).not_to have_content('Allows edits from maintainers')
expect(page).not_to have_content('Allows commits from members who can merge to the target branch')
end
end
end
......@@ -22,7 +22,7 @@ describe('RWidgetMaintainerEdit', () => {
});
it('it renders the message', () => {
expect(vm.$el.textContent.trim()).toEqual('Allows edits from maintainers');
expect(vm.$el.textContent.trim()).toEqual('Allows commits from members who can merge to the target branch');
});
});
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment