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
2f3dc314
Commit
2f3dc314
authored
Sep 14, 2016
by
Kamil Trzcinski
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Fix spec failures
parent
4e60f79e
Changes
5
Show whitespace changes
Inline
Side-by-side
Showing
5 changed files
with
10 additions
and
13 deletions
+10
-13
app/views/projects/ci/builds/_build_pipeline.html.haml
app/views/projects/ci/builds/_build_pipeline.html.haml
+0
-2
app/views/projects/commit/_pipeline_stage.html.haml
app/views/projects/commit/_pipeline_stage.html.haml
+1
-1
app/views/projects/commit/_pipeline_status_group.html.haml
app/views/projects/commit/_pipeline_status_group.html.haml
+2
-2
app/views/projects/generic_commit_statuses/_generic_commit_status_pipeline.html.haml
...commit_statuses/_generic_commit_status_pipeline.html.haml
+1
-1
spec/views/projects/pipelines/show.html.haml_spec.rb
spec/views/projects/pipelines/show.html.haml_spec.rb
+6
-7
No files found.
app/views/projects/ci/builds/_build_pipeline.html.haml
View file @
2f3dc314
...
@@ -10,5 +10,3 @@
...
@@ -10,5 +10,3 @@
-
else
-
else
=
render_status_with_link
(
'build'
,
subject
.
status
)
=
render_status_with_link
(
'build'
,
subject
.
status
)
=
ci_icon_for_status
(
subject
.
status
)
=
ci_icon_for_status
(
subject
.
status
)
app/views/projects/commit/_pipeline_stage.html.haml
View file @
2f3dc314
...
@@ -3,7 +3,7 @@
...
@@ -3,7 +3,7 @@
-
if
grouped_statuses
.
one?
-
if
grouped_statuses
.
one?
-
status
=
grouped_statuses
.
first
-
status
=
grouped_statuses
.
first
-
is_playable
=
status
.
playable?
&&
can?
(
current_user
,
:update_build
,
@project
)
-
is_playable
=
status
.
playable?
&&
can?
(
current_user
,
:update_build
,
@project
)
%li
.build
{
class:
(
"playable"
if
is_playable
)
}
%li
.build
{
class:
(
"playable"
if
is_playable
)
}
.curve
.curve
.build-content
.build-content
=
render
"projects/
#{
status
.
to_partial_path
}
_pipeline"
,
subject:
status
=
render
"projects/
#{
status
.
to_partial_path
}
_pipeline"
,
subject:
status
...
...
app/views/projects/commit/_pipeline_status_group.html.haml
View file @
2f3dc314
-
group_status
=
CommitStatus
.
where
(
id:
subject
).
status
-
group_status
=
CommitStatus
.
where
(
id:
subject
).
status
=
render_status_with_link
(
'build'
,
group_status
)
=
render_status_with_link
(
'build'
,
group_status
)
.dropdown.inline
.dropdown.inline
%button
.dropdown-menu-toggle
{
type:
'button'
,
data:
{
toggle:
'dropdown'
}
}
%button
.dropdown-menu-toggle
{
type:
'button'
,
data:
{
toggle:
'dropdown'
}
}
%span
.ci-status-text
%span
.ci-status-text
=
name
=
name
%span
.badge
=
subject
.
length
%span
.badge
=
subject
.
size
%ul
.dropdown-menu.grouped-pipeline-dropdown
%ul
.dropdown-menu.grouped-pipeline-dropdown
.arrow
.arrow
-
subject
.
each
do
|
status
|
-
subject
.
each
do
|
status
|
...
...
app/views/projects/generic_commit_statuses/_generic_commit_status_pipeline.html.haml
View file @
2f3dc314
-
if
subject
.
target_url
-
if
subject
.
target_url
-
link_to
subject
.
target_url
do
=
link_to
subject
.
target_url
do
=
render_status_with_link
(
'commit status'
,
subject
.
status
)
=
render_status_with_link
(
'commit status'
,
subject
.
status
)
%span
.ci-status-text
=
subject
.
name
%span
.ci-status-text
=
subject
.
name
-
else
-
else
...
...
spec/views/projects/pipelines/show.html.haml_spec.rb
View file @
2f3dc314
...
@@ -4,15 +4,14 @@ describe 'projects/pipelines/show' do
...
@@ -4,15 +4,14 @@ describe 'projects/pipelines/show' do
include
Devise
::
TestHelpers
include
Devise
::
TestHelpers
let
(
:project
)
{
create
(
:project
)
}
let
(
:project
)
{
create
(
:project
)
}
let
(
:pipeline
)
do
let
(
:pipeline
)
{
create
(
:ci_empty_pipeline
,
project:
project
,
sha:
project
.
commit
.
id
)
}
create
(
:ci_empty_pipeline
,
project:
project
,
sha:
project
.
commit
.
id
)
end
before
do
before
do
controller
.
prepend_view_path
(
'app/views/projects'
)
create_build
(
'build'
,
0
,
'build'
)
create_build
(
'build'
,
0
,
'build'
)
create_build
(
'test'
,
1
,
'rspec 0
2'
)
create_build
(
'test'
,
1
,
'rspec 0
:
2'
)
create_build
(
'test'
,
1
,
'rspec 1
2'
)
create_build
(
'test'
,
1
,
'rspec 1
:
2'
)
create_build
(
'test'
,
1
,
'audit'
)
create_build
(
'test'
,
1
,
'audit'
)
create_build
(
'deploy'
,
2
,
'production'
)
create_build
(
'deploy'
,
2
,
'production'
)
...
@@ -38,7 +37,7 @@ describe 'projects/pipelines/show' do
...
@@ -38,7 +37,7 @@ describe 'projects/pipelines/show' do
# builds
# builds
expect
(
rendered
).
to
have_text
(
'rspec'
)
expect
(
rendered
).
to
have_text
(
'rspec'
)
expect
(
rendered
).
to
have_text
(
'rspec 0:
1
'
)
expect
(
rendered
).
to
have_text
(
'rspec 0:
2
'
)
expect
(
rendered
).
to
have_text
(
'production'
)
expect
(
rendered
).
to
have_text
(
'production'
)
expect
(
rendered
).
to
have_text
(
'jenkins'
)
expect
(
rendered
).
to
have_text
(
'jenkins'
)
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