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
0333e2b8
Commit
0333e2b8
authored
Apr 10, 2017
by
Felipe Artur
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Fix spec/features/merge_requests/only_allow_merge_if_build_succeeds_spec.rb
parent
60475001
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
2 additions
and
2 deletions
+2
-2
app/views/projects/merge_requests/widget/open/_accept.html.haml
...ews/projects/merge_requests/widget/open/_accept.html.haml
+2
-2
No files found.
app/views/projects/merge_requests/widget/open/_accept.html.haml
View file @
0333e2b8
...
...
@@ -10,7 +10,7 @@
-
if
@pipeline
&&
@pipeline
.
active?
%span
.btn-group
=
button_tag
class:
"btn btn-info js-merge-when-pipeline-succeeds-button merge-when-pipeline-succeeds"
,
disabled:
!
@merge_request
.
approved?
,
":disabled"
=>
"disableAcceptance"
do
Merge
When Pipeline S
ucceeds
Merge
when pipeline s
ucceeds
-
unless
@project
.
only_allow_merge_if_pipeline_succeeds?
=
button_tag
class:
"btn btn-info dropdown-toggle"
,
'data-toggle'
=>
'dropdown'
,
disabled:
!
@merge_request
.
approved?
,
":disabled"
=>
"disableAcceptance"
do
=
icon
(
'caret-down'
)
...
...
@@ -27,7 +27,7 @@
Merge immediately
-
else
=
f
.
button
class:
"btn btn-grouped js-merge-button accept-merge-request"
,
disabled:
!
@merge_request
.
approved?
,
":disabled"
=>
"disableAcceptance"
do
Accept
Merge R
equest
Accept
merge r
equest
-
if
@merge_request
.
force_remove_source_branch?
.accept-control
The source branch will be removed.
...
...
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