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
e94f378b
Commit
e94f378b
authored
Dec 06, 2016
by
Grzegorz Bizon
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Improve support for icons in new detailed statuses
parent
79e132fa
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
5 additions
and
2 deletions
+5
-2
app/views/projects/pipelines/_info.html.haml
app/views/projects/pipelines/_info.html.haml
+0
-1
lib/gitlab/ci/status/core.rb
lib/gitlab/ci/status/core.rb
+1
-1
lib/gitlab/ci/status/pipeline/success_with_warnings.rb
lib/gitlab/ci/status/pipeline/success_with_warnings.rb
+4
-0
No files found.
app/views/projects/pipelines/_info.html.haml
View file @
e94f378b
...
@@ -2,7 +2,6 @@
...
@@ -2,7 +2,6 @@
.header-main-content
.header-main-content
=
ci_status_with_icon
(
@pipeline
.
detailed_status
)
=
ci_status_with_icon
(
@pipeline
.
detailed_status
)
%strong
Pipeline ##{@commit.pipelines.last.id}
%strong
Pipeline ##{@commit.pipelines.last.id}
#{
ci_label_for_status
(
@pipeline
.
detailed_status
)
}
,
triggered
#{
time_ago_with_tooltip
(
@commit
.
authored_date
)
}
by
triggered
#{
time_ago_with_tooltip
(
@commit
.
authored_date
)
}
by
=
author_avatar
(
@commit
,
size:
24
)
=
author_avatar
(
@commit
,
size:
24
)
=
commit_author_link
(
@commit
)
=
commit_author_link
(
@commit
)
...
...
lib/gitlab/ci/status/core.rb
View file @
e94f378b
...
@@ -30,7 +30,7 @@ module Gitlab
...
@@ -30,7 +30,7 @@ module Gitlab
# phasing legacy satuses out.
# phasing legacy satuses out.
#
#
def
to_s
def
to_s
self
.
class
.
name
.
demodulize
.
downcase
self
.
class
.
name
.
demodulize
.
downcase
.
underscore
end
end
def
has_details?
def
has_details?
...
...
lib/gitlab/ci/status/pipeline/success_with_warnings.rb
View file @
e94f378b
...
@@ -17,6 +17,10 @@ module Gitlab
...
@@ -17,6 +17,10 @@ module Gitlab
'icon_status_warning'
'icon_status_warning'
end
end
def
to_s
'success_with_warnings'
end
def
self
.
matches?
(
pipeline
)
def
self
.
matches?
(
pipeline
)
pipeline
.
success?
&&
pipeline
.
has_warnings?
pipeline
.
success?
&&
pipeline
.
has_warnings?
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