diff options
| author | Dimitrie Hoekstra <dimitriehoekstra@gmail.com> | 2016-11-18 17:28:02 +0100 |
|---|---|---|
| committer | Dimitrie Hoekstra <dimitriehoekstra@gmail.com> | 2016-11-18 17:28:02 +0100 |
| commit | 512aa57d367527e7d5d61417981a99685db6e2f0 (patch) | |
| tree | 30065d236395dba4126148e98aac41c039bc5e77 | |
| parent | 548f48ef6dcb20ab401cc118052e1b9bcb4afccf (diff) | |
| download | gitlab-ce-512aa57d367527e7d5d61417981a99685db6e2f0.tar.gz | |
If Build running change accept merge request when build succeeds button from orange to blue
3 files changed, 6 insertions, 2 deletions
diff --git a/app/assets/stylesheets/pages/merge_requests.scss b/app/assets/stylesheets/pages/merge_requests.scss index b6a82460f25..72995f951c7 100644 --- a/app/assets/stylesheets/pages/merge_requests.scss +++ b/app/assets/stylesheets/pages/merge_requests.scss @@ -24,7 +24,7 @@ .accept_merge_request { &.ci-pending, &.ci-running { - @include btn-orange; + @include btn-blue; } &.ci-skipped, diff --git a/app/views/projects/merge_requests/widget/open/_merge_when_build_succeeds.html.haml b/app/views/projects/merge_requests/widget/open/_merge_when_build_succeeds.html.haml index 2b6b5e05e86..1aeb12e4661 100644 --- a/app/views/projects/merge_requests/widget/open/_merge_when_build_succeeds.html.haml +++ b/app/views/projects/merge_requests/widget/open/_merge_when_build_succeeds.html.haml @@ -21,5 +21,5 @@ Remove Source Branch When Merged - if user_can_cancel_automatic_merge - = link_to cancel_merge_when_build_succeeds_namespace_project_merge_request_path(@merge_request.target_project.namespace, @merge_request.target_project, @merge_request), remote: true, method: :post, class: "btn btn-grouped btn-warning btn-sm" do + = link_to cancel_merge_when_build_succeeds_namespace_project_merge_request_path(@merge_request.target_project.namespace, @merge_request.target_project, @merge_request), remote: true, method: :post, class: "btn btn-grouped btn-sm" do Cancel Automatic Merge diff --git a/changelogs/unreleased/24266-Afraid to press the Orange button on Merge request screen b/changelogs/unreleased/24266-Afraid to press the Orange button on Merge request screen new file mode 100644 index 00000000000..28ca20c7dcc --- /dev/null +++ b/changelogs/unreleased/24266-Afraid to press the Orange button on Merge request screen @@ -0,0 +1,4 @@ +--- +title: If Build running change accept merge request when build succeeds button from orange to blue +merge_request: 7577 +author: |