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
1
Merge Requests
1
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
nexedi
gitlab-ce
Commits
274524a2
Commit
274524a2
authored
Feb 01, 2017
by
Bryce Johnson
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Don't forget the @'s.
parent
02780224
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
3 additions
and
3 deletions
+3
-3
app/views/projects/merge_requests/widget/open/_accept.html.haml
...ews/projects/merge_requests/widget/open/_accept.html.haml
+3
-3
No files found.
app/views/projects/merge_requests/widget/open/_accept.html.haml
View file @
274524a2
...
...
@@ -11,10 +11,10 @@
.accept-action
-
if
@pipeline
&&
@pipeline
.
active?
%span
.btn-group
=
button_tag
class:
"btn btn-create js-merge-button merge_when_build_succeeds"
,
disabled:
!
merge_request
.
approved?
,
":disabled"
=>
"disableAcceptance"
do
=
button_tag
class:
"btn btn-create js-merge-button merge_when_build_succeeds"
,
disabled:
!
@
merge_request
.
approved?
,
":disabled"
=>
"disableAcceptance"
do
Merge When Pipeline Succeeds
-
unless
@project
.
only_allow_merge_if_build_succeeds?
=
button_tag
class:
"btn btn-success dropdown-toggle"
,
'data-toggle'
=>
'dropdown'
,
disabled:
!
merge_request
.
approved?
,
":disabled"
=>
"disableAcceptance"
do
=
button_tag
class:
"btn btn-success dropdown-toggle"
,
'data-toggle'
=>
'dropdown'
,
disabled:
!
@
merge_request
.
approved?
,
":disabled"
=>
"disableAcceptance"
do
=
icon
(
'caret-down'
)
%span
.sr-only
Select Merge Moment
...
...
@@ -28,7 +28,7 @@
=
icon
(
'warning fw'
)
Merge Immediately
-
else
=
f
.
button
class:
"btn btn-create btn-grouped js-merge-button accept_merge_request
#{
status_class
}
"
,
disabled:
!
merge_request
.
approved?
,
":disabled"
=>
"disableAcceptance"
do
=
f
.
button
class:
"btn btn-create btn-grouped js-merge-button accept_merge_request
#{
status_class
}
"
,
disabled:
!
@
merge_request
.
approved?
,
":disabled"
=>
"disableAcceptance"
do
Accept Merge Request
-
if
@merge_request
.
force_remove_source_branch?
.accept-control
...
...
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