summaryrefslogtreecommitdiff
path: root/app/views/shared/issuable/form/_contribution.html.haml
diff options
context:
space:
mode:
authorMark Chao <mchao@gitlab.com>2018-05-23 09:54:57 +0800
committerMark Chao <mchao@gitlab.com>2018-06-01 14:33:12 +0900
commit0d44f4d50ef175997fe1f90de9e622a4f3b867e3 (patch)
tree1a494b42fdc26c700c87f5ce65e5553ed7ab78db /app/views/shared/issuable/form/_contribution.html.haml
parent76c23de3b63503a08a715afb6414596a7a4879d2 (diff)
downloadgitlab-ce-0d44f4d50ef175997fe1f90de9e622a4f3b867e3.tar.gz
Rephrase "maintainer" to more precise "members who can merge to the target branch"42751-rename-mr-maintainer-push
"Maintainer" will be freed to be used for #42751
Diffstat (limited to 'app/views/shared/issuable/form/_contribution.html.haml')
-rw-r--r--app/views/shared/issuable/form/_contribution.html.haml10
1 files changed, 5 insertions, 5 deletions
diff --git a/app/views/shared/issuable/form/_contribution.html.haml b/app/views/shared/issuable/form/_contribution.html.haml
index b34549240e0..519b5fae846 100644
--- a/app/views/shared/issuable/form/_contribution.html.haml
+++ b/app/views/shared/issuable/form/_contribution.html.haml
@@ -12,9 +12,9 @@
= _('Contribution')
.col-sm-10
.form-check
- = form.check_box :allow_maintainer_to_push, disabled: !issuable.can_allow_maintainer_to_push?(current_user), class: 'form-check-input'
- = form.label :allow_maintainer_to_push, class: 'form-check-label' do
- = _('Allow edits from maintainers.')
- = link_to 'About this feature', help_page_path('user/project/merge_requests/maintainer_access')
+ = form.check_box :allow_collaboration, disabled: !issuable.can_allow_collaboration?(current_user), class: 'form-check-input'
+ = form.label :allow_collaboration, class: 'form-check-label' do
+ = _('Allow commits from members who can merge to the target branch.')
+ = link_to 'About this feature', help_page_path('user/project/merge_requests/allow_collaboration')
.form-text.text-muted
- = allow_maintainer_push_unavailable_reason(issuable)
+ = allow_collaboration_unavailable_reason(issuable)