Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
G
gitlab-ce
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
0
Merge Requests
0
Analytics
Analytics
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Commits
Issue Boards
Open sidebar
Boxiang Sun
gitlab-ce
Commits
512aa57d
Commit
512aa57d
authored
Nov 18, 2016
by
Dimitrie Hoekstra
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
If Build running change accept merge request when build succeeds button from orange to blue
parent
548f48ef
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
6 additions
and
2 deletions
+6
-2
app/assets/stylesheets/pages/merge_requests.scss
app/assets/stylesheets/pages/merge_requests.scss
+1
-1
app/views/projects/merge_requests/widget/open/_merge_when_build_succeeds.html.haml
...requests/widget/open/_merge_when_build_succeeds.html.haml
+1
-1
changelogs/unreleased/24266-Afraid to press the Orange button on Merge request screen
...Afraid to press the Orange button on Merge request screen
+4
-0
No files found.
app/assets/stylesheets/pages/merge_requests.scss
View file @
512aa57d
...
@@ -24,7 +24,7 @@
...
@@ -24,7 +24,7 @@
.accept_merge_request
{
.accept_merge_request
{
&
.ci-pending
,
&
.ci-pending
,
&
.ci-running
{
&
.ci-running
{
@include
btn-
orang
e
;
@include
btn-
blu
e
;
}
}
&
.ci-skipped
,
&
.ci-skipped
,
...
...
app/views/projects/merge_requests/widget/open/_merge_when_build_succeeds.html.haml
View file @
512aa57d
...
@@ -21,5 +21,5 @@
...
@@ -21,5 +21,5 @@
Remove Source Branch When Merged
Remove Source Branch When Merged
-
if
user_can_cancel_automatic_merge
-
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
Cancel Automatic Merge
changelogs/unreleased/24266-Afraid to press the Orange button on Merge request screen
0 → 100644
View file @
512aa57d
---
title: If Build running change accept merge request when build succeeds button from orange to blue
merge_request: 7577
author:
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment