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
4ba48d6b
Commit
4ba48d6b
authored
Dec 14, 2016
by
Filipa Lacerda
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Merge two partials into one. Rename it to match the other partials
parent
863146d4
Changes
4
Hide whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
20 additions
and
10 deletions
+20
-10
app/views/ci/status/_badge_graph_icon_with_name_and_action.html.haml
...i/status/_badge_graph_icon_with_name_and_action.html.haml
+18
-0
app/views/ci/status/_icon_with_name_and_action.html.haml
app/views/ci/status/_icon_with_name_and_action.html.haml
+0
-8
app/views/projects/stage/_graph.html.haml
app/views/projects/stage/_graph.html.haml
+1
-1
app/views/projects/stage/_in_stage_group.html.haml
app/views/projects/stage/_in_stage_group.html.haml
+1
-1
No files found.
app/views/ci/status/_
icon_with_name
.html.haml
→
app/views/ci/status/_
badge_graph_icon_with_name_and_action
.html.haml
View file @
4ba48d6b
...
@@ -3,9 +3,16 @@
...
@@ -3,9 +3,16 @@
-
klass
=
"ci-status-icon ci-status-icon-
#{
detailed_status
}
"
-
klass
=
"ci-status-icon ci-status-icon-
#{
detailed_status
}
"
-
if
details_path
-
if
details_path
=
link_to
details_path
,
class:
klass
,
data:
{
toggle:
'tooltip'
,
title:
"
#{
subject
.
name
}
-
#{
detailed_status
}
"
}
do
=
link_to
details_path
,
class:
klass
,
data:
{
toggle:
'tooltip'
,
title:
"
#{
subject
.
name
}
-
#{
detailed_status
}
"
}
do
%span
{
class:
klass
}=
custom_icon
(
detailed_status
.
icon
)
%span
{
class:
klass
}=
custom_icon
(
detailed_status
.
icon
)
.ci-status-text
=
subject
.
name
.ci-status-text
=
subject
.
name
-
else
-
else
%span
{
class:
klass
}=
custom_icon
(
detailed_status
.
icon
)
%span
{
class:
klass
}=
custom_icon
(
detailed_status
.
icon
)
.ci-status-text
=
subject
.
name
.ci-status-text
=
subject
.
name
-
if
detailed_status
.
has_action?
=
link_to
detailed_status
.
action_path
,
method:
detailed_status
.
action_method
,
title:
"
#{
subject
.
name
}
:
#{
detailed_status
.
action_title
}
"
,
class:
'ci-action-icon-container'
do
%i
.ci-action-icon-wrapper
=
icon
(
detailed_status
.
action_icon
,
class:
detailed_status
.
action_class
)
app/views/ci/status/_icon_with_name_and_action.html.haml
deleted
100644 → 0
View file @
863146d4
=
render
"ci/status/icon_with_name"
,
subject:
subject
-
detailed_status
=
subject
.
detailed_status
(
current_user
)
-
if
detailed_status
.
has_action?
=
link_to
detailed_status
.
action_path
,
method:
detailed_status
.
action_method
,
title:
"
#{
subject
.
name
}
:
#{
detailed_status
.
action_title
}
"
,
class:
'ci-action-icon-container'
do
%i
.ci-action-icon-wrapper
=
icon
(
detailed_status
.
action_icon
,
class:
detailed_status
.
action_class
)
app/views/projects/stage/_graph.html.haml
View file @
4ba48d6b
...
@@ -13,7 +13,7 @@
...
@@ -13,7 +13,7 @@
%li
.build
%li
.build
.curve
.curve
.build-content
.build-content
=
render
'ci/status/icon_with_name_and_action'
,
subject:
status
=
render
'ci/status/
bagde_graph_
icon_with_name_and_action'
,
subject:
status
-
else
-
else
%li
.build
%li
.build
.curve
.curve
...
...
app/views/projects/stage/_in_stage_group.html.haml
View file @
4ba48d6b
...
@@ -10,4 +10,4 @@
...
@@ -10,4 +10,4 @@
%ul
%ul
-
subject
.
each
do
|
status
|
-
subject
.
each
do
|
status
|
%li
.dropdown-build
%li
.dropdown-build
=
render
'ci/status/icon_with_name_and_action'
,
subject:
status
=
render
'ci/status/
bagde_graph_
icon_with_name_and_action'
,
subject:
status
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