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
6679a906
Commit
6679a906
authored
Jan 27, 2017
by
Filipa Lacerda
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Use badge partial as single source of truth instead of having 2 partials doing the same
Update changelog description Changes after review
parent
4ab83117
Hide whitespace changes
Inline
Side-by-side
Showing
9 changed files
with
17 additions
and
19 deletions
+17
-19
show.html.haml
app/views/admin/runners/show.html.haml
+1
-1
_badge.html.haml
app/views/ci/status/_badge.html.haml
+10
-3
_badge_link.html.haml
app/views/ci/status/_badge_link.html.haml
+0
-9
_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
_pipeline.html.haml
app/views/projects/ci/pipelines/_pipeline.html.haml
+1
-1
_generic_commit_status.html.haml
.../generic_commit_statuses/_generic_commit_status.html.haml
+1
-1
_info.html.haml
app/views/projects/pipelines/_info.html.haml
+1
-1
26947-build-status-self-link.yml
changelogs/unreleased/26947-build-status-self-link.yml
+1
-1
No files found.
app/views/admin/runners/show.html.haml
View file @
6679a906
...
...
@@ -91,7 +91,7 @@
%strong
##{build.id}
%td
.status
=
render
'ci/status/badge
_link
'
,
status:
build
.
detailed_status
(
current_user
)
=
render
'ci/status/badge'
,
status:
build
.
detailed_status
(
current_user
)
%td
.status
-
if
project
...
...
app/views/ci/status/_badge.html.haml
View file @
6679a906
-
status
=
local_assigns
.
fetch
(
:status
)
-
link
=
local_assigns
.
fetch
(
:link
,
true
)
-
css_classes
=
"ci-status ci-
#{
status
.
group
}
"
%span
{
class:
"ci-status ci-#{status.group}"
}
=
custom_icon
(
status
.
icon
)
=
status
.
text
-
if
link
&&
status
.
has_details?
=
link_to
status
.
details_path
,
class:
css_classes
do
=
custom_icon
(
status
.
icon
)
=
status
.
text
-
else
%span
{
class:
css_classes
}
=
custom_icon
(
status
.
icon
)
=
status
.
text
app/views/ci/status/_badge_link.html.haml
deleted
100644 → 0
View file @
4ab83117
-
status
=
local_assigns
.
fetch
(
:status
)
-
css_classes
=
"ci-status ci-
#{
status
.
group
}
"
-
if
status
.
has_details?
=
link_to
status
.
details_path
,
class:
css_classes
do
=
custom_icon
(
status
.
icon
)
=
status
.
text
-
else
=
render
"ci/status/badge"
,
status:
status
app/views/projects/builds/_header.html.haml
View file @
6679a906
.content-block.build-header
.header-content
=
render
'ci/status/badge'
,
status:
@build
.
detailed_status
(
current_user
)
=
render
'ci/status/badge'
,
status:
@build
.
detailed_status
(
current_user
)
,
link:
false
Build
%strong
.js-build-id
##{@build.id}
in pipeline
...
...
app/views/projects/ci/builds/_build.html.haml
View file @
6679a906
...
...
@@ -9,7 +9,7 @@
%tr
.build.commit
{
class:
(
'retried'
if
retried
)
}
%td
.status
=
render
"ci/status/badge
_link
"
,
status:
build
.
detailed_status
(
current_user
)
=
render
"ci/status/badge"
,
status:
build
.
detailed_status
(
current_user
)
%td
.branch-commit
-
if
can?
(
current_user
,
:read_build
,
build
)
...
...
app/views/projects/ci/pipelines/_pipeline.html.haml
View file @
6679a906
...
...
@@ -4,7 +4,7 @@
%tr
.commit
%td
.commit-link
=
render
'ci/status/badge
_link
'
,
status:
pipeline
.
detailed_status
(
current_user
)
=
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
...
...
app/views/projects/generic_commit_statuses/_generic_commit_status.html.haml
View file @
6679a906
...
...
@@ -8,7 +8,7 @@
%tr
.generic_commit_status
{
class:
(
'retried'
if
retried
)
}
%td
.status
=
render
'ci/status/badge
_link
'
,
status:
generic_commit_status
.
detailed_status
(
current_user
)
=
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
...
...
app/views/projects/pipelines/_info.html.haml
View file @
6679a906
.page-content-header
.header-main-content
=
render
'ci/status/badge
_link
'
,
status:
@pipeline
.
detailed_status
(
current_user
)
=
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
)
...
...
changelogs/unreleased/26947-build-status-self-link.yml
View file @
6679a906
---
title
:
Add
new ci status partial
to render a badge without a link
title
:
Add
link verification to badge partial in order
to render a badge without a link
merge_request
:
8740
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