BigW Consortium Gitlab
Skip to content
Projects
Groups
Snippets
Help
This project
Loading...
Sign in / Register
Toggle navigation
G
gitlab-ce
Project
Overview
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
Registry
Registry
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Commits
Issue Boards
Open sidebar
Forest Godfrey
gitlab-ce
Commits
2d7bc695
Commit
2d7bc695
authored
Mar 19, 2017
by
Rydkin Maxim
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
adds tooltips into several places
parent
aa4a9b9b
Hide whitespace changes
Inline
Side-by-side
Showing
5 changed files
with
12 additions
and
7 deletions
+12
-7
ci_status_helper.rb
app/helpers/ci_status_helper.rb
+4
-0
_badge.html.haml
app/views/ci/status/_badge.html.haml
+5
-4
_header.html.haml
app/views/projects/builds/_header.html.haml
+1
-1
_build.html.haml
app/views/projects/ci/builds/_build.html.haml
+1
-1
_info.html.haml
app/views/projects/pipelines/_info.html.haml
+1
-1
No files found.
app/helpers/ci_status_helper.rb
View file @
2d7bc695
...
...
@@ -121,4 +121,8 @@ module CiStatusHelper
status
.
respond_to?
(
:label
)
&&
status
.
respond_to?
(
:icon
)
end
def
status_title
(
pipeline
)
"This pipeline is redundant as a newer pipeline exists (canceled by #
#{
pipeline
.
auto_canceled_by_id
}
pipeline)"
if
pipeline
.
auto_canceled_by_id?
&&
pipeline
.
canceled?
end
end
app/views/ci/status/_badge.html.haml
View file @
2d7bc695
-
status
=
local_assigns
.
fetch
(
:status
)
-
link
=
local_assigns
.
fetch
(
:link
,
true
)
-
css_classes
=
"ci-status ci-
#{
status
.
group
}
"
-
link
=
local_assigns
.
fetch
(
:link
,
true
)
-
title
=
local_assigns
.
fetch
(
:title
,
nil
)
-
css_classes
=
"ci-status ci-
#{
status
.
group
}
#{
'has-tooltip'
if
title
.
present?
}
"
-
if
link
&&
status
.
has_details?
=
link_to
status
.
details_path
,
class:
css_classes
do
=
link_to
status
.
details_path
,
class:
css_classes
,
title:
title
do
=
custom_icon
(
status
.
icon
)
=
status
.
text
-
else
%span
{
class:
css_classes
}
%span
{
class:
css_classes
,
title:
title
}
=
custom_icon
(
status
.
icon
)
=
status
.
text
app/views/projects/builds/_header.html.haml
View file @
2d7bc695
.content-block.build-header.top-area
.header-content
=
render
'ci/status/badge'
,
status:
@build
.
detailed_status
(
current_user
),
link:
false
=
render
'ci/status/badge'
,
status:
@build
.
detailed_status
(
current_user
),
link:
false
,
title:
status_title
(
@build
.
pipeline
)
Job
%strong
.js-build-id
##{@build.id}
in pipeline
...
...
app/views/projects/ci/builds/_build.html.haml
View file @
2d7bc695
...
...
@@ -9,7 +9,7 @@
%tr
.build.commit
{
class:
(
'retried'
if
retried
)
}
%td
.status
=
render
"ci/status/badge"
,
status:
build
.
detailed_status
(
current_user
)
=
render
"ci/status/badge"
,
status:
build
.
detailed_status
(
current_user
)
,
title:
status_title
(
build
.
pipeline
)
%td
.branch-commit
-
if
can?
(
current_user
,
:read_build
,
build
)
...
...
app/views/projects/pipelines/_info.html.haml
View file @
2d7bc695
.page-content-header
.header-main-content
=
render
'ci/status/badge'
,
status:
@pipeline
.
detailed_status
(
current_user
)
=
render
'ci/status/badge'
,
status:
@pipeline
.
detailed_status
(
current_user
)
,
title:
status_title
(
@pipeline
)
%strong
Pipeline ##{@pipeline.id}
triggered
#{
time_ago_with_tooltip
(
@pipeline
.
created_at
)
}
-
if
@pipeline
.
user
...
...
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