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
Jérome Perrin
gitlab-ce
Commits
e3490437
Commit
e3490437
authored
Nov 06, 2015
by
Baldinof
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Merge button has color from CI status
parent
f57d5922
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
17 additions
and
1 deletion
+17
-1
app/assets/stylesheets/pages/merge_requests.scss
app/assets/stylesheets/pages/merge_requests.scss
+14
-0
app/views/projects/merge_requests/widget/open/_accept.html.haml
...ews/projects/merge_requests/widget/open/_accept.html.haml
+3
-1
No files found.
app/assets/stylesheets/pages/merge_requests.scss
View file @
e3490437
...
@@ -19,6 +19,20 @@
...
@@ -19,6 +19,20 @@
.accept-merge-holder
{
.accept-merge-holder
{
.accept-action
{
.accept-action
{
display
:
inline-block
;
display
:
inline-block
;
.accept_merge_request
{
&
.ci-pending
,
&
.ci-running
{
@include
btn-orange
;
}
&
.ci-skipped
,
&
.ci-failed
,
&
.ci-canceled
,
&
.ci-error
{
@include
btn-red
;
}
}
}
}
.accept-control
{
.accept-control
{
...
...
app/views/projects/merge_requests/widget/open/_accept.html.haml
View file @
e3490437
-
status_class
=
@merge_request
.
ci_commit
?
" ci-
#{
@merge_request
.
ci_commit
.
status
}
"
:
nil
=
form_for
[
:merge
,
@project
.
namespace
.
becomes
(
Namespace
),
@project
,
@merge_request
],
remote:
true
,
method: :post
,
html:
{
class:
'accept-mr-form js-requires-input'
}
do
|
f
|
=
form_for
[
:merge
,
@project
.
namespace
.
becomes
(
Namespace
),
@project
,
@merge_request
],
remote:
true
,
method: :post
,
html:
{
class:
'accept-mr-form js-requires-input'
}
do
|
f
|
=
hidden_field_tag
:authenticity_token
,
form_authenticity_token
=
hidden_field_tag
:authenticity_token
,
form_authenticity_token
.accept-merge-holder.clearfix.js-toggle-container
.accept-merge-holder.clearfix.js-toggle-container
.accept-action
.accept-action
=
f
.
button
class:
"btn btn-create accept_merge_request"
do
=
f
.
button
class:
"btn btn-create accept_merge_request
#{
status_class
}
"
do
Accept Merge Request
Accept Merge Request
-
if
can_remove_branch?
(
@merge_request
.
source_project
,
@merge_request
.
source_branch
)
&&
!
@merge_request
.
for_fork?
-
if
can_remove_branch?
(
@merge_request
.
source_project
,
@merge_request
.
source_branch
)
&&
!
@merge_request
.
for_fork?
.accept-control.checkbox
.accept-control.checkbox
...
...
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