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
Léo-Paul Géneau
gitlab-ce
Commits
dc67554c
Commit
dc67554c
authored
8 years ago
by
Grzegorz Bizon
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Improve detailed status badge partial
parent
23f02681
No related merge requests found
Changes
8
Hide whitespace changes
Inline
Side-by-side
Showing
8 changed files
with
14 additions
and
18 deletions
+14
-18
app/views/admin/runners/show.html.haml
app/views/admin/runners/show.html.haml
+1
-1
app/views/ci/status/_badge.html.haml
app/views/ci/status/_badge.html.haml
+8
-0
app/views/ci/status/_icon_with_description.html.haml
app/views/ci/status/_icon_with_description.html.haml
+0
-12
app/views/projects/builds/_header.html.haml
app/views/projects/builds/_header.html.haml
+1
-1
app/views/projects/ci/builds/_build.html.haml
app/views/projects/ci/builds/_build.html.haml
+1
-1
app/views/projects/ci/pipelines/_pipeline.html.haml
app/views/projects/ci/pipelines/_pipeline.html.haml
+1
-1
app/views/projects/generic_commit_statuses/_generic_commit_status.html.haml
.../generic_commit_statuses/_generic_commit_status.html.haml
+1
-1
app/views/projects/pipelines/_info.html.haml
app/views/projects/pipelines/_info.html.haml
+1
-1
No files found.
app/views/admin/runners/show.html.haml
View file @
dc67554c
...
...
@@ -91,7 +91,7 @@
%strong
##{build.id}
%td
.status
=
render
"ci/status/icon_with_description"
,
subject:
build
=
render
'ci/status/badge'
,
status:
build
.
detailed_status
(
current_user
)
%td
.status
-
if
project
...
...
This diff is collapsed.
Click to expand it.
app/views/ci/status/_badge.html.haml
0 → 100644
View file @
dc67554c
-
if
status
.
has_details?
=
link_to
status
.
details_path
,
class:
"ci-status ci-
#{
status
}
"
do
=
custom_icon
(
status
.
icon
)
=
status
.
text
-
else
%span
{
class:
"ci-status ci-#{status}"
}
=
custom_icon
(
status
.
icon
)
=
detailed_status
.
text
This diff is collapsed.
Click to expand it.
app/views/ci/status/_icon_with_description.html.haml
deleted
100644 → 0
View file @
23f02681
-
detailed_status
=
subject
.
detailed_status
(
current_user
)
-
details_path
=
detailed_status
.
details_path
if
detailed_status
.
has_details?
-
klass
=
"ci-status ci-
#{
detailed_status
}
"
-
if
details_path
=
link_to
details_path
,
class:
klass
do
=
custom_icon
(
detailed_status
.
icon
)
=
detailed_status
.
text
-
else
%span
{
class:
klass
}
=
custom_icon
(
detailed_status
.
icon
)
=
detailed_status
.
text
This diff is collapsed.
Click to expand it.
app/views/projects/builds/_header.html.haml
View file @
dc67554c
.content-block.build-header
.header-content
=
render
"ci/status/icon_with_description"
,
subject:
build
=
render
'ci/status/badge'
,
status:
@build
.
detailed_status
(
current_user
)
Build
%strong
##{@build.id}
in pipeline
...
...
This diff is collapsed.
Click to expand it.
app/views/projects/ci/builds/_build.html.haml
View file @
dc67554c
...
...
@@ -9,7 +9,7 @@
%tr
.build.commit
{
class:
(
'retried'
if
retried
)}
%td
.status
=
render
"ci/status/
icon_with_description"
,
subject:
build
=
render
"ci/status/
badge"
,
status:
build
.
detailed_status
(
current_user
)
%td
.branch-commit
-
if
can?
(
current_user
,
:read_build
,
build
)
...
...
This diff is collapsed.
Click to expand it.
app/views/projects/ci/pipelines/_pipeline.html.haml
View file @
dc67554c
...
...
@@ -4,7 +4,7 @@
%tr
.commit
%td
.commit-link
=
render
"ci/status/icon_with_description"
,
subject:
pipeline
=
render
'ci/status/badge'
,
status:
pipeline
.
detailed_status
(
current_user
)
%td
=
link_to
namespace_project_pipeline_path
(
pipeline
.
project
.
namespace
,
pipeline
.
project
,
pipeline
.
id
)
do
...
...
This diff is collapsed.
Click to expand it.
app/views/projects/generic_commit_statuses/_generic_commit_status.html.haml
View file @
dc67554c
...
...
@@ -8,7 +8,7 @@
%tr
.generic_commit_status
{
class:
(
'retried'
if
retried
)}
%td
.status
=
render
"ci/status/icon_with_description"
,
subject:
generic_commit_status
=
render
'ci/status/badge'
,
status:
generic_commit_status
.
detailed_status
(
current_user
)
%td
.generic_commit_status-link
-
if
can?
(
current_user
,
:read_commit_status
,
generic_commit_status
)
&&
generic_commit_status
.
target_url
...
...
This diff is collapsed.
Click to expand it.
app/views/projects/pipelines/_info.html.haml
View file @
dc67554c
.page-content-header
.header-main-content
=
render
"ci/status/icon_with_description"
,
subject:
@pipeline
=
render
'ci/status/badge'
,
status:
@pipeline
.
detailed_status
(
current_user
)
%strong
Pipeline ##{@commit.pipelines.last.id}
triggered
#{
time_ago_with_tooltip
(
@commit
.
authored_date
)
}
by
=
author_avatar
(
@commit
,
size:
24
)
...
...
This diff is collapsed.
Click to expand it.
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