diff options
author | Luke "Jared" Bennett <lbennett@gitlab.com> | 2017-04-10 14:04:52 +0300 |
---|---|---|
committer | Luke "Jared" Bennett <lbennett@gitlab.com> | 2017-04-10 14:04:52 +0300 |
commit | 884e6ad4cba1998b831be61a2a1499ceebd2c478 (patch) | |
tree | 4869c0aaa17113cae0fbf0badc170d68405892f5 /app/views/projects/merge_requests/widget/open/_accept.html.haml | |
parent | 153d844029d825b89816bff5b926b51f24cc9b51 (diff) | |
parent | c98add157732004d9a2eaa39770edf84eaca6896 (diff) |
Merge branch 'master' into 20827-getting-started-update-new-group-view
Diffstat (limited to 'app/views/projects/merge_requests/widget/open/_accept.html.haml')
-rw-r--r-- | app/views/projects/merge_requests/widget/open/_accept.html.haml | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/app/views/projects/merge_requests/widget/open/_accept.html.haml b/app/views/projects/merge_requests/widget/open/_accept.html.haml index e5ec151a61d..cb117d1908c 100644 --- a/app/views/projects/merge_requests/widget/open/_accept.html.haml +++ b/app/views/projects/merge_requests/widget/open/_accept.html.haml @@ -10,24 +10,24 @@ - if @pipeline && @pipeline.active? %span.btn-group = button_tag class: "btn btn-info js-merge-when-pipeline-succeeds-button merge-when-pipeline-succeeds" do - Merge When Pipeline Succeeds + Merge when pipeline succeeds - unless @project.only_allow_merge_if_pipeline_succeeds? = button_tag class: "btn btn-info dropdown-toggle", 'data-toggle' => 'dropdown' do = icon('caret-down') %span.sr-only - Select Merge Moment + Select merge moment %ul.js-merge-dropdown.dropdown-menu.dropdown-menu-right{ role: 'menu' } %li = link_to "#", class: "merge_when_pipeline_succeeds" do = icon('check fw') - Merge When Pipeline Succeeds + Merge when pipeline succeeds %li = link_to "#", class: "accept-merge-request" do = icon('warning fw') - Merge Immediately + Merge immediately - else = f.button class: "btn btn-grouped js-merge-button accept-merge-request" do - Accept Merge Request + Accept merge request - if @merge_request.force_remove_source_branch? .accept-control The source branch will be removed. |