From 512aa57d367527e7d5d61417981a99685db6e2f0 Mon Sep 17 00:00:00 2001 From: Dimitrie Hoekstra Date: Fri, 18 Nov 2016 17:28:02 +0100 Subject: [PATCH 1/4] If Build running change accept merge request when build succeeds button from orange to blue --- app/assets/stylesheets/pages/merge_requests.scss | 2 +- .../widget/open/_merge_when_build_succeeds.html.haml | 2 +- ...-Afraid to press the Orange button on Merge request screen | 4 ++++ 3 files changed, 6 insertions(+), 2 deletions(-) create mode 100644 changelogs/unreleased/24266-Afraid to press the Orange button on Merge request screen 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: From 02d1adecc39e50d2dbaf71fcdd3b2636c0d87856 Mon Sep 17 00:00:00 2001 From: Dimitrie Hoekstra Date: Tue, 22 Nov 2016 15:00:24 +0100 Subject: [PATCH 2/4] added proper changelog entry --- ...aid-to-press-the-Orange-button-on-Merge-request-screen.yml | 4 ++++ 1 file changed, 4 insertions(+) create mode 100644 changelogs/unreleased/24266-Afraid-to-press-the-Orange-button-on-Merge-request-screen.yml diff --git a/changelogs/unreleased/24266-Afraid-to-press-the-Orange-button-on-Merge-request-screen.yml b/changelogs/unreleased/24266-Afraid-to-press-the-Orange-button-on-Merge-request-screen.yml new file mode 100644 index 00000000000..28ca20c7dcc --- /dev/null +++ b/changelogs/unreleased/24266-Afraid-to-press-the-Orange-button-on-Merge-request-screen.yml @@ -0,0 +1,4 @@ +--- +title: If Build running change accept merge request when build succeeds button from orange to blue +merge_request: 7577 +author: From e4c282c06724c93c494a6fee2bfa71a8fedad056 Mon Sep 17 00:00:00 2001 From: Dimitrie Hoekstra Date: Tue, 22 Nov 2016 15:02:23 +0100 Subject: [PATCH 3/4] deleted old changelog entry --- ...-Afraid to press the Orange button on Merge request screen | 4 ---- 1 file changed, 4 deletions(-) delete mode 100644 changelogs/unreleased/24266-Afraid to press the Orange button on Merge request screen 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 deleted file mode 100644 index 28ca20c7dcc..00000000000 --- a/changelogs/unreleased/24266-Afraid to press the Orange button on Merge request screen +++ /dev/null @@ -1,4 +0,0 @@ ---- -title: If Build running change accept merge request when build succeeds button from orange to blue -merge_request: 7577 -author: From 11785719cd6ba246551af188549a158154c2c9bf Mon Sep 17 00:00:00 2001 From: Annabel Dunstone Gray Date: Tue, 22 Nov 2016 14:37:48 -0700 Subject: [PATCH 4/4] Use btn-primary for running builds btn --- app/assets/javascripts/merge_request_widget.js.es6 | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/app/assets/javascripts/merge_request_widget.js.es6 b/app/assets/javascripts/merge_request_widget.js.es6 index 56c87af3226..ef27a9c91c0 100644 --- a/app/assets/javascripts/merge_request_widget.js.es6 +++ b/app/assets/javascripts/merge_request_widget.js.es6 @@ -67,7 +67,7 @@ MergeRequestWidget.prototype.addEventListeners = function() { var allowedPages; allowedPages = ['show', 'commits', 'builds', 'pipelines', 'changes']; - return $(document).on('page:change.merge_request', (function(_this) { + $(document).on('page:change.merge_request', (function(_this) { return function() { var page; page = $('body').data('page').split(':').last(); @@ -245,7 +245,7 @@ case "not_found": return this.setMergeButtonClass('btn-danger'); case "running": - return this.setMergeButtonClass('btn-warning'); + return this.setMergeButtonClass('btn-info'); case "success": case "success_with_warnings": return this.setMergeButtonClass('btn-create'); @@ -263,7 +263,7 @@ }; MergeRequestWidget.prototype.setMergeButtonClass = function(css_class) { - return $('.js-merge-button,.accept-action .dropdown-toggle').removeClass('btn-danger btn-warning btn-create').addClass(css_class); + return $('.js-merge-button,.accept-action .dropdown-toggle').removeClass('btn-danger btn-info btn-create').addClass(css_class); }; return MergeRequestWidget;