diff options
| author | Robert Speicher <robert@gitlab.com> | 2018-06-05 18:04:18 +0300 |
|---|---|---|
| committer | Robert Speicher <robert@gitlab.com> | 2018-06-05 18:04:18 +0300 |
| commit | 6ced2f124355ac08b111b4c2ac60ae57e3851ba4 (patch) | |
| tree | 53f92c7f7766f9c0384ea507d812ce5e7d421b99 /app/views/shared | |
| parent | cb77087246929cc92f6bd7ce2cb306855b6e6219 (diff) | |
| parent | 0d44f4d50ef175997fe1f90de9e622a4f3b867e3 (diff) | |
Merge branch '42751-rename-mr-maintainer-push' into 'master'
Rephrase Merge Request Maintainer Edit
See merge request gitlab-org/gitlab-ce!19061
Diffstat (limited to 'app/views/shared')
| -rw-r--r-- | app/views/shared/issuable/form/_contribution.html.haml | 10 | ||||
| -rw-r--r-- | app/views/shared/projects/_edit_information.html.haml | 2 |
2 files changed, 6 insertions, 6 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) diff --git a/app/views/shared/projects/_edit_information.html.haml b/app/views/shared/projects/_edit_information.html.haml index ec9dc8f62c2..9230e045a81 100644 --- a/app/views/shared/projects/_edit_information.html.haml +++ b/app/views/shared/projects/_edit_information.html.haml @@ -1,6 +1,6 @@ - unless can?(current_user, :push_code, @project) .inline.prepend-left-10 - - if @project.branch_allows_maintainer_push?(current_user, selected_branch) + - if @project.branch_allows_collaboration?(current_user, selected_branch) = commit_in_single_accessible_branch - else = commit_in_fork_help |