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
74459e0c
Commit
74459e0c
authored
Mar 22, 2017
by
Filipa Lacerda
Browse files
Options
Browse Files
Download
Plain Diff
Merge branch 'pipelines-build-tooltip' into 'master'
Fixed the job tootip being cut-off Closes #29800 See merge request !10135
parents
bd90f502
d48b95e2
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
7 additions
and
3 deletions
+7
-3
_graph_badge.html.haml
app/views/ci/status/_graph_badge.html.haml
+2
-2
_in_stage_group.html.haml
app/views/projects/stage/_in_stage_group.html.haml
+1
-1
pipelines-build-tooltip.yml
changelogs/unreleased/pipelines-build-tooltip.yml
+4
-0
No files found.
app/views/ci/status/_graph_badge.html.haml
View file @
74459e0c
...
@@ -6,7 +6,7 @@
...
@@ -6,7 +6,7 @@
-
tooltip
=
"
#{
subject
.
name
}
-
#{
status
.
label
}
"
-
tooltip
=
"
#{
subject
.
name
}
-
#{
status
.
label
}
"
-
if
status
.
has_details?
-
if
status
.
has_details?
=
link_to
status
.
details_path
,
class:
'build-content has-tooltip'
,
data:
{
toggle:
'tooltip'
,
title:
tooltip
}
do
=
link_to
status
.
details_path
,
class:
'build-content has-tooltip'
,
data:
{
toggle:
'tooltip'
,
title:
tooltip
,
container:
'body'
}
do
%span
{
class:
klass
}=
custom_icon
(
status
.
icon
)
%span
{
class:
klass
}=
custom_icon
(
status
.
icon
)
.ci-status-text
=
subject
.
name
.ci-status-text
=
subject
.
name
-
else
-
else
...
@@ -15,6 +15,6 @@
...
@@ -15,6 +15,6 @@
.ci-status-text
=
subject
.
name
.ci-status-text
=
subject
.
name
-
if
status
.
has_action?
-
if
status
.
has_action?
=
link_to
status
.
action_path
,
class:
'ci-action-icon-container has-tooltip'
,
method:
status
.
action_method
,
data:
{
toggle:
'tooltip'
,
title:
status
.
action_title
}
do
=
link_to
status
.
action_path
,
class:
'ci-action-icon-container has-tooltip'
,
method:
status
.
action_method
,
data:
{
toggle:
'tooltip'
,
title:
status
.
action_title
,
container:
'body'
}
do
%i
.ci-action-icon-wrapper
{
class:
"js-#{status.action_icon.dasherize}"
}
%i
.ci-action-icon-wrapper
{
class:
"js-#{status.action_icon.dasherize}"
}
=
custom_icon
(
status
.
action_icon
)
=
custom_icon
(
status
.
action_icon
)
app/views/projects/stage/_in_stage_group.html.haml
View file @
74459e0c
-
group_status
=
CommitStatus
.
where
(
id:
subject
).
status
-
group_status
=
CommitStatus
.
where
(
id:
subject
).
status
%button
.dropdown-menu-toggle.build-content.has-tooltip
{
type:
'button'
,
data:
{
toggle:
'dropdown'
,
title:
"#{name} - #{group_status}"
}
}
%button
.dropdown-menu-toggle.build-content.has-tooltip
{
type:
'button'
,
data:
{
toggle:
'dropdown'
,
title:
"#{name} - #{group_status}"
,
container:
'body'
}
}
%span
{
class:
"ci-status-icon ci-status-icon-#{group_status}"
}
%span
{
class:
"ci-status-icon ci-status-icon-#{group_status}"
}
=
ci_icon_for_status
(
group_status
)
=
ci_icon_for_status
(
group_status
)
%span
.ci-status-text
%span
.ci-status-text
...
...
changelogs/unreleased/pipelines-build-tooltip.yml
0 → 100644
View file @
74459e0c
---
title
:
Fixed job tooltip being cut-off
merge_request
:
author
:
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