diff options
| author | Fatih Acet <acetfatih@gmail.com> | 2016-11-23 02:11:45 +0300 |
|---|---|---|
| committer | Fatih Acet <acetfatih@gmail.com> | 2016-11-23 02:11:45 +0300 |
| commit | ead44226e00016e63029c37c8365932459053f81 (patch) | |
| tree | b34afa7d33864bf7b35755dcaeed41fa35e56d1e /app/views/projects/merge_requests | |
| parent | 85e6bb8f3ca34fde6db6095976592a2ed8c75139 (diff) | |
| parent | 11785719cd6ba246551af188549a158154c2c9bf (diff) | |
Merge branch '24266-afraid-to-press-the-orange-button-on-merge-request-screen' into 'master'
If Build running change accept merge request when build succeeds button from orange to blue
## What does this MR do?
If Build running change accept merge request when build succeeds button from orange to blue
## Are there points in the code the reviewer needs to double check?
I didn't really check, but to my knowledge these changes should fix it. Would love to know how to set up working pipelines in my local build.
## Why was this MR needed?
orange was to big a warning color for this button
## Screenshots (if relevant)
## Does this MR meet the acceptance criteria?
- [x] [Changelog entry](https://docs.gitlab.com/ce/development/changelog.html) added
- [ ] [Documentation created/updated](https://gitlab.com/gitlab-org/gitlab-ce/blob/master/doc/development/doc_styleguide.md)
- [ ] API support added
- Tests
- [ ] Added for this feature/bug
- [ ] All builds are passing
- [ ] Conform by the [merge request performance guides](http://docs.gitlab.com/ce/development/merge_request_performance_guidelines.html)
- [ ] Conform by the [style guides](https://gitlab.com/gitlab-org/gitlab-ce/blob/master/CONTRIBUTING.md#style-guides)
- [ ] Branch has no merge conflicts with `master` (if it does - rebase it please)
- [ ] [Squashed related commits together](https://git-scm.com/book/en/Git-Tools-Rewriting-History#Squashing-Commits)
## What are the relevant issue numbers?
Closes #24266
See merge request !7577
Diffstat (limited to 'app/views/projects/merge_requests')
| -rw-r--r-- | app/views/projects/merge_requests/widget/open/_merge_when_build_succeeds.html.haml | 2 |
1 files changed, 1 insertions, 1 deletions
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 |