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
Boxiang Sun
gitlab-ce
Commits
ed696df5
Commit
ed696df5
authored
Apr 13, 2018
by
Clement Ho
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
[skip ci] label-primary => badge-primary
parent
4f6e6a24
Changes
10
Hide whitespace changes
Inline
Side-by-side
Showing
10 changed files
with
10 additions
and
10 deletions
+10
-10
app/views/admin/runners/_runner.html.haml
app/views/admin/runners/_runner.html.haml
+1
-1
app/views/projects/branches/_branch.html.haml
app/views/projects/branches/_branch.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/generic_commit_statuses/_generic_commit_status.html.haml
.../generic_commit_statuses/_generic_commit_status.html.haml
+1
-1
app/views/projects/jobs/show.html.haml
app/views/projects/jobs/show.html.haml
+1
-1
app/views/projects/runners/_runner.html.haml
app/views/projects/runners/_runner.html.haml
+1
-1
app/views/projects/runners/show.html.haml
app/views/projects/runners/show.html.haml
+1
-1
app/views/projects/triggers/_content.html.haml
app/views/projects/triggers/_content.html.haml
+1
-1
app/views/projects/triggers/_trigger.html.haml
app/views/projects/triggers/_trigger.html.haml
+1
-1
app/views/search/results/_merge_request.html.haml
app/views/search/results/_merge_request.html.haml
+1
-1
No files found.
app/views/admin/runners/_runner.html.haml
View file @
ed696df5
...
...
@@ -27,7 +27,7 @@
#{
runner
.
builds
.
count
(
:all
)
}
%td
-
runner
.
tag_list
.
sort
.
each
do
|
tag
|
%span
.badge.
label
-primary
%span
.badge.
badge
-primary
=
tag
%td
-
if
runner
.
contacted_at
...
...
app/views/projects/branches/_branch.html.haml
View file @
ed696df5
...
...
@@ -13,7 +13,7 @@
=
branch
.
name
-
if
branch
.
name
==
@repository
.
root_ref
%span
.badge.
label
-primary
default
%span
.badge.
badge
-primary
default
-
elsif
merged
%span
.badge.label-info.has-tooltip
{
title:
s_
(
'
Branches
|
Merged
into
%
{
default_branch
}
'
)
%
{
default_branch:
@repository
.
root_ref
}
}
=
s_
(
'Branches|merged'
)
...
...
app/views/projects/ci/builds/_build.html.haml
View file @
ed696df5
...
...
@@ -41,7 +41,7 @@
.label-container
-
if
job
.
tags
.
any?
-
job
.
tags
.
each
do
|
tag
|
%span
.badge.
label
-primary
%span
.badge.
badge
-primary
=
tag
-
if
job
.
try
(
:trigger_request
)
%span
.badge.label-info
triggered
...
...
app/views/projects/generic_commit_statuses/_generic_commit_status.html.haml
View file @
ed696df5
...
...
@@ -35,7 +35,7 @@
.label-container
-
if
generic_commit_status
.
tags
.
any?
-
generic_commit_status
.
tags
.
each
do
|
tag
|
%span
.badge.
label
-primary
%span
.badge.
badge
-primary
=
tag
-
if
retried
%span
.badge.badge-warning
retried
...
...
app/views/projects/jobs/show.html.haml
View file @
ed696df5
...
...
@@ -15,7 +15,7 @@
-
elsif
@build
.
tags
.
any?
This job is stuck, because you don't have any active runners online with any of these tags assigned to them:
-
@build
.
tags
.
each
do
|
tag
|
%span
.badge.
label
-primary
%span
.badge.
badge
-primary
=
tag
-
else
This job is stuck, because you don't have any active runners that can run this job.
...
...
app/views/projects/runners/_runner.html.haml
View file @
ed696df5
...
...
@@ -39,5 +39,5 @@
-
if
runner
.
tag_list
.
present?
%p
-
runner
.
tag_list
.
sort
.
each
do
|
tag
|
%span
.badge.
label
-primary
%span
.badge.
badge
-primary
=
tag
app/views/projects/runners/show.html.haml
View file @
ed696df5
...
...
@@ -32,7 +32,7 @@
%td
Tags
%td
-
@runner
.
tag_list
.
sort
.
each
do
|
tag
|
%span
.badge.
label
-primary
%span
.badge.
badge
-primary
=
tag
%tr
%td
Name
...
...
app/views/projects/triggers/_content.html.haml
View file @
ed696df5
%p
.append-bottom-default
Triggers with the
%span
.badge.
label
-primary
legacy
%span
.badge.
badge
-primary
legacy
label do not have an associated user and only have access to the current project.
%br
=
succeed
'.'
do
...
...
app/views/projects/triggers/_trigger.html.haml
View file @
ed696df5
...
...
@@ -8,7 +8,7 @@
.label-container
-
if
trigger
.
legacy?
%span
.badge.
label
-primary.has-tooltip
{
title:
"Trigger makes use of deprecated functionality"
}
legacy
%span
.badge.
badge
-primary.has-tooltip
{
title:
"Trigger makes use of deprecated functionality"
}
legacy
-
if
!
trigger
.
can_access_project?
%span
.badge.label-danger.has-tooltip
{
title:
"Trigger user has insufficient permissions to project"
}
invalid
...
...
app/views/search/results/_merge_request.html.haml
View file @
ed696df5
...
...
@@ -3,7 +3,7 @@
=
link_to
[
merge_request
.
target_project
.
namespace
.
becomes
(
Namespace
),
merge_request
.
target_project
,
merge_request
]
do
%span
.term.str-truncated
=
merge_request
.
title
-
if
merge_request
.
merged?
%span
.badge.
label
-primary.prepend-left-5
Merged
%span
.badge.
badge
-primary.prepend-left-5
Merged
-
elsif
merge_request
.
closed?
%span
.badge.label-danger.prepend-left-5
Closed
.float-right
=
merge_request
.
to_reference
...
...
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