diff options
| author | Grzegorz Bizon <grzesiek.bizon@gmail.com> | 2016-11-21 11:20:53 +0100 |
|---|---|---|
| committer | Grzegorz Bizon <grzesiek.bizon@gmail.com> | 2016-11-21 11:20:53 +0100 |
| commit | d07ef089c8870b4a5a1c69555c54c93ff1f1fa24 (patch) | |
| tree | d835e4e32f2bd075645acb194fc4cd443cc0f429 /app | |
| parent | bd3ae192bb62d522912281b5943073f6ad444fe4 (diff) | |
| download | gitlab-ce-d07ef089c8870b4a5a1c69555c54c93ff1f1fa24.tar.gz | |
Rename MWPS in user interface and feature tests
Diffstat (limited to 'app')
| -rw-r--r-- | app/views/projects/merge_requests/widget/open/_accept.html.haml | 4 |
1 files changed, 2 insertions, 2 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 ce43ca3a286..435fe835fae 100644 --- a/app/views/projects/merge_requests/widget/open/_accept.html.haml +++ b/app/views/projects/merge_requests/widget/open/_accept.html.haml @@ -9,7 +9,7 @@ - if @pipeline && @pipeline.active? %span.btn-group = button_tag class: "btn btn-create js-merge-button merge_when_build_succeeds" do - Merge When Build Succeeds + Merge When Pipeline Succeeds - unless @project.only_allow_merge_if_build_succeeds? = button_tag class: "btn btn-success dropdown-toggle", 'data-toggle' => 'dropdown' do = icon('caret-down') @@ -19,7 +19,7 @@ %li = link_to "#", class: "merge_when_build_succeeds" do = icon('check fw') - Merge When Build Succeeds + Merge When Pipeline Succeeds %li = link_to "#", class: "accept_merge_request" do = icon('warning fw') |