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
2c23465d
Commit
2c23465d
authored
Aug 17, 2016
by
Annabel Dunstone
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Move deployable conditional to variable; fix pipelines_spec
parent
bfe2259b
Changes
2
Show whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
8 additions
and
3 deletions
+8
-3
app/views/projects/ci/builds/_build_pipeline.html.haml
app/views/projects/ci/builds/_build_pipeline.html.haml
+3
-2
spec/features/projects/pipelines_spec.rb
spec/features/projects/pipelines_spec.rb
+5
-1
No files found.
app/views/projects/ci/builds/_build_pipeline.html.haml
View file @
2c23465d
%li
.build
{
class:
(
"playable"
if
subject
.
playable?
&&
can?
(
current_user
,
:update_build
,
@project
))}
-
is_playable
=
subject
.
playable?
&&
can?
(
current_user
,
:update_build
,
@project
)
%li
.build
{
class:
(
"playable"
if
is_playable
)}
.build-content
.build-content
-
if
subject
.
playable?
&&
can?
(
current_user
,
:update_build
,
@project
)
-
if
is_playable
=
link_to
play_namespace_project_build_path
(
subject
.
project
.
namespace
,
subject
.
project
,
subject
,
return_to:
request
.
original_url
),
method: :post
,
title:
'Play'
do
=
link_to
play_namespace_project_build_path
(
subject
.
project
.
namespace
,
subject
.
project
,
subject
,
return_to:
request
.
original_url
),
method: :post
,
title:
'Play'
do
=
render_status_with_link
(
'build'
,
'play'
)
=
render_status_with_link
(
'build'
,
'play'
)
=
subject
.
name
=
subject
.
name
...
...
spec/features/projects/pipelines_spec.rb
View file @
2c23465d
...
@@ -193,7 +193,11 @@ describe "Pipelines" do
...
@@ -193,7 +193,11 @@ describe "Pipelines" do
end
end
context
'playing manual build'
do
context
'playing manual build'
do
before
{
click_link
(
'Play'
)
}
before
do
within
'.pipeline-holder'
do
click_link
(
'Play'
)
end
end
it
{
expect
(
@manual
.
reload
).
to
be_pending
}
it
{
expect
(
@manual
.
reload
).
to
be_pending
}
end
end
...
...
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