diff options
| author | Fatih Acet <acetfatih@gmail.com> | 2018-01-24 21:06:42 +0000 |
|---|---|---|
| committer | Fatih Acet <acetfatih@gmail.com> | 2018-01-24 21:06:42 +0000 |
| commit | 44728e0527bc7c5cf982be2fbbd26e24a79e5d8f (patch) | |
| tree | 14987709153bccf6cad4774c1fcb8389f3befb6e | |
| parent | caf84a0306450d97f6939393670aa8c4c807ddca (diff) | |
| parent | eceeafb6bb19f53daf879e76af2fadc87eeee582 (diff) | |
| download | gitlab-ce-44728e0527bc7c5cf982be2fbbd26e24a79e5d8f.tar.gz | |
Merge branch '39917-revert-this-merge-request-text' into 'master'
Resolve ""Revert this merge request" modal has confusing string"
Closes #39917
See merge request gitlab-org/gitlab-ce!16611
| -rw-r--r-- | app/views/projects/commit/_change.html.haml | 3 | ||||
| -rw-r--r-- | changelogs/unreleased/39917-revert-this-merge-request-text.yml | 5 |
2 files changed, 8 insertions, 0 deletions
diff --git a/app/views/projects/commit/_change.html.haml b/app/views/projects/commit/_change.html.haml index d0a380516f9..93407956f56 100644 --- a/app/views/projects/commit/_change.html.haml +++ b/app/views/projects/commit/_change.html.haml @@ -4,6 +4,7 @@ - branch_label = s_('ChangeTypeActionLabel|Revert in branch') - revert_merge_request = _('Revert this merge request') - revert_commit = _('Revert this commit') + - description = s_('ChangeTypeAction|This will create a new commit in order to revert the existing changes.') - title = commit.merged_merge_request(current_user) ? revert_merge_request : revert_commit - when 'cherry-pick' - label = s_('ChangeTypeAction|Cherry-pick') @@ -17,6 +18,8 @@ %a.close{ href: "#", "data-dismiss" => "modal" } × %h3.page-title= title .modal-body + - if description + %p.append-bottom-20= description = form_tag [type.underscore, @project.namespace.becomes(Namespace), @project, commit], method: :post, remote: false, class: "form-horizontal js-#{type}-form js-requires-input" do .form-group.branch = label_tag 'start_branch', branch_label, class: 'control-label' diff --git a/changelogs/unreleased/39917-revert-this-merge-request-text.yml b/changelogs/unreleased/39917-revert-this-merge-request-text.yml new file mode 100644 index 00000000000..9a27be1f9c6 --- /dev/null +++ b/changelogs/unreleased/39917-revert-this-merge-request-text.yml @@ -0,0 +1,5 @@ +--- +title: Changes Revert this merge request text +merge_request: 16611 +author: Jacopo Beschi @jacopo-beschi +type: changed |