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
5e546f4b
Commit
5e546f4b
authored
Apr 13, 2018
by
Clement Ho
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
[skip ci] label-danger => badge-danger
parent
e3de2ab1
Changes
14
Show whitespace changes
Inline
Side-by-side
Showing
14 changed files
with
14 additions
and
14 deletions
+14
-14
app/views/admin/runners/_runner.html.haml
app/views/admin/runners/_runner.html.haml
+1
-1
app/views/admin/runners/index.html.haml
app/views/admin/runners/index.html.haml
+1
-1
app/views/admin/users/_user.html.haml
app/views/admin/users/_user.html.haml
+1
-1
app/views/import/bitbucket/status.html.haml
app/views/import/bitbucket/status.html.haml
+1
-1
app/views/import/google_code/status.html.haml
app/views/import/google_code/status.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/pages/_list.html.haml
app/views/projects/pages/_list.html.haml
+1
-1
app/views/projects/pages_domains/show.html.haml
app/views/projects/pages_domains/show.html.haml
+1
-1
app/views/projects/runners/_index.html.haml
app/views/projects/runners/_index.html.haml
+1
-1
app/views/projects/triggers/_trigger.html.haml
app/views/projects/triggers/_trigger.html.haml
+1
-1
app/views/search/results/_issue.html.haml
app/views/search/results/_issue.html.haml
+1
-1
app/views/search/results/_merge_request.html.haml
app/views/search/results/_merge_request.html.haml
+1
-1
app/views/shared/hook_logs/_status_label.html.haml
app/views/shared/hook_logs/_status_label.html.haml
+1
-1
app/views/shared/members/_member.html.haml
app/views/shared/members/_member.html.haml
+1
-1
No files found.
app/views/admin/runners/_runner.html.haml
View file @
5e546f4b
...
@@ -7,7 +7,7 @@
...
@@ -7,7 +7,7 @@
-
if
runner
.
locked?
-
if
runner
.
locked?
%span
.badge.badge-warning
locked
%span
.badge.badge-warning
locked
-
unless
runner
.
active?
-
unless
runner
.
active?
%span
.badge.
label
-danger
paused
%span
.badge.
badge
-danger
paused
%td
%td
=
link_to
admin_runner_path
(
runner
)
do
=
link_to
admin_runner_path
(
runner
)
do
...
...
app/views/admin/runners/index.html.haml
View file @
5e546f4b
...
@@ -23,7 +23,7 @@
...
@@ -23,7 +23,7 @@
%span
.badge.badge-warning
locked
%span
.badge.badge-warning
locked
\- Runner cannot be assigned to other projects
\- Runner cannot be assigned to other projects
%li
%li
%span
.badge.
label
-danger
paused
%span
.badge.
badge
-danger
paused
\- Runner will not receive any new jobs
\- Runner will not receive any new jobs
.bs-callout.clearfix
.bs-callout.clearfix
...
...
app/views/admin/users/_user.html.haml
View file @
5e546f4b
...
@@ -5,7 +5,7 @@
...
@@ -5,7 +5,7 @@
.user-name.row-title.str-truncated-100
.user-name.row-title.str-truncated-100
=
link_to
user
.
name
,
[
:admin
,
user
]
=
link_to
user
.
name
,
[
:admin
,
user
]
-
if
user
.
blocked?
-
if
user
.
blocked?
%span
.badge.
label
-danger
blocked
%span
.badge.
badge
-danger
blocked
-
if
user
.
admin?
-
if
user
.
admin?
%span
.badge.badge-success
Admin
%span
.badge.badge-success
Admin
-
if
user
.
external?
-
if
user
.
external?
...
...
app/views/import/bitbucket/status.html.haml
View file @
5e546f4b
...
@@ -74,7 +74,7 @@
...
@@ -74,7 +74,7 @@
=
link_to
repo
.
full_name
,
"https://bitbucket.org/
#{
repo
.
full_name
}
"
,
target:
'_blank'
,
rel:
'noopener noreferrer'
=
link_to
repo
.
full_name
,
"https://bitbucket.org/
#{
repo
.
full_name
}
"
,
target:
'_blank'
,
rel:
'noopener noreferrer'
%td
.import-target
%td
.import-target
%td
.import-actions-job-status
%td
.import-actions-job-status
=
label_tag
'Incompatible Project'
,
nil
,
class:
'label
label
-danger'
=
label_tag
'Incompatible Project'
,
nil
,
class:
'label
badge
-danger'
-
if
@incompatible_repos
.
any?
-
if
@incompatible_repos
.
any?
%p
%p
...
...
app/views/import/google_code/status.html.haml
View file @
5e546f4b
...
@@ -66,7 +66,7 @@
...
@@ -66,7 +66,7 @@
=
link_to
repo
.
name
,
"https://code.google.com/p/
#{
repo
.
name
}
"
,
target:
"_blank"
,
rel:
'noopener noreferrer'
=
link_to
repo
.
name
,
"https://code.google.com/p/
#{
repo
.
name
}
"
,
target:
"_blank"
,
rel:
'noopener noreferrer'
%td
.import-target
%td
.import-target
%td
.import-actions-job-status
%td
.import-actions-job-status
=
label_tag
"Incompatible Project"
,
nil
,
class:
"label
label
-danger"
=
label_tag
"Incompatible Project"
,
nil
,
class:
"label
badge
-danger"
-
if
@incompatible_repos
.
any?
-
if
@incompatible_repos
.
any?
%p
%p
...
...
app/views/projects/ci/builds/_build.html.haml
View file @
5e546f4b
...
@@ -46,7 +46,7 @@
...
@@ -46,7 +46,7 @@
-
if
job
.
try
(
:trigger_request
)
-
if
job
.
try
(
:trigger_request
)
%span
.badge.label-info
triggered
%span
.badge.label-info
triggered
-
if
job
.
try
(
:allow_failure
)
-
if
job
.
try
(
:allow_failure
)
%span
.badge.
label
-danger
allowed to fail
%span
.badge.
badge
-danger
allowed to fail
-
if
job
.
action?
-
if
job
.
action?
%span
.badge.label-info
manual
%span
.badge.label-info
manual
...
...
app/views/projects/pages/_list.html.haml
View file @
5e546f4b
...
@@ -19,7 +19,7 @@
...
@@ -19,7 +19,7 @@
%p
%p
%span
.badge.label-gray
Certificate:
#{
domain
.
subject
}
%span
.badge.label-gray
Certificate:
#{
domain
.
subject
}
-
if
domain
.
expired?
-
if
domain
.
expired?
%span
.badge.
label
-danger
Expired
%span
.badge.
badge
-danger
Expired
%div
%div
=
link_to
'Details'
,
project_pages_domain_path
(
@project
,
domain
),
class:
"btn btn-sm btn-grouped"
=
link_to
'Details'
,
project_pages_domain_path
(
@project
,
domain
),
class:
"btn btn-sm btn-grouped"
=
link_to
'Remove'
,
project_pages_domain_path
(
@project
,
domain
),
data:
{
confirm:
'Are you sure?'
},
method: :delete
,
class:
"btn btn-remove btn-sm btn-grouped"
=
link_to
'Remove'
,
project_pages_domain_path
(
@project
,
domain
),
data:
{
confirm:
'Are you sure?'
},
method: :delete
,
class:
"btn btn-remove btn-sm btn-grouped"
...
...
app/views/projects/pages_domains/show.html.haml
View file @
5e546f4b
...
@@ -43,7 +43,7 @@
...
@@ -43,7 +43,7 @@
%td
%td
=
form_tag
verify_project_pages_domain_path
(
@project
,
@domain
)
do
=
form_tag
verify_project_pages_domain_path
(
@project
,
@domain
)
do
.status-badge
.status-badge
-
text
,
status
=
@domain
.
unverified?
?
[
_
(
'Unverified'
),
'
label
-danger'
]
:
[
_
(
'Verified'
),
'badge-success'
]
-
text
,
status
=
@domain
.
unverified?
?
[
_
(
'Unverified'
),
'
badge
-danger'
]
:
[
_
(
'Verified'
),
'badge-success'
]
.label
{
class:
status
}
.label
{
class:
status
}
=
text
=
text
%button
.btn.has-tooltip
{
type:
"submit"
,
data:
{
container:
'body'
},
title:
_
(
"Retry verification"
)
}
%button
.btn.has-tooltip
{
type:
"submit"
,
data:
{
container:
'body'
},
title:
_
(
"Retry verification"
)
}
...
...
app/views/projects/runners/_index.html.haml
View file @
5e546f4b
...
@@ -12,7 +12,7 @@
...
@@ -12,7 +12,7 @@
%span
.badge.badge-success
active
%span
.badge.badge-success
active
\- Runner is active and can process any new jobs
\- Runner is active and can process any new jobs
%li
%li
%span
.badge.
label
-danger
paused
%span
.badge.
badge
-danger
paused
\- Runner is paused and will not receive any new jobs
\- Runner is paused and will not receive any new jobs
%hr
%hr
...
...
app/views/projects/triggers/_trigger.html.haml
View file @
5e546f4b
...
@@ -10,7 +10,7 @@
...
@@ -10,7 +10,7 @@
-
if
trigger
.
legacy?
-
if
trigger
.
legacy?
%span
.badge.badge-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?
-
if
!
trigger
.
can_access_project?
%span
.badge.
label
-danger.has-tooltip
{
title:
"Trigger user has insufficient permissions to project"
}
invalid
%span
.badge.
badge
-danger.has-tooltip
{
title:
"Trigger user has insufficient permissions to project"
}
invalid
%td
%td
-
if
trigger
.
description?
&&
trigger
.
description
.
length
>
15
-
if
trigger
.
description?
&&
trigger
.
description
.
length
>
15
...
...
app/views/search/results/_issue.html.haml
View file @
5e546f4b
...
@@ -4,7 +4,7 @@
...
@@ -4,7 +4,7 @@
=
link_to
[
issue
.
project
.
namespace
.
becomes
(
Namespace
),
issue
.
project
,
issue
]
do
=
link_to
[
issue
.
project
.
namespace
.
becomes
(
Namespace
),
issue
.
project
,
issue
]
do
%span
.term.str-truncated
=
issue
.
title
%span
.term.str-truncated
=
issue
.
title
-
if
issue
.
closed?
-
if
issue
.
closed?
%span
.badge.
label
-danger.prepend-left-5
Closed
%span
.badge.
badge
-danger.prepend-left-5
Closed
.float-right
##{issue.iid}
.float-right
##{issue.iid}
-
if
issue
.
description
.
present?
-
if
issue
.
description
.
present?
.description.term
.description.term
...
...
app/views/search/results/_merge_request.html.haml
View file @
5e546f4b
...
@@ -5,7 +5,7 @@
...
@@ -5,7 +5,7 @@
-
if
merge_request
.
merged?
-
if
merge_request
.
merged?
%span
.badge.badge-primary.prepend-left-5
Merged
%span
.badge.badge-primary.prepend-left-5
Merged
-
elsif
merge_request
.
closed?
-
elsif
merge_request
.
closed?
%span
.badge.
label
-danger.prepend-left-5
Closed
%span
.badge.
badge
-danger.prepend-left-5
Closed
.float-right
=
merge_request
.
to_reference
.float-right
=
merge_request
.
to_reference
-
if
merge_request
.
description
.
present?
-
if
merge_request
.
description
.
present?
.description.term
.description.term
...
...
app/views/shared/hook_logs/_status_label.html.haml
View file @
5e546f4b
-
label_status
=
hook_log
.
success?
?
'badge-success'
:
'
label
-danger'
-
label_status
=
hook_log
.
success?
?
'badge-success'
:
'
badge
-danger'
%span
{
class:
"label #{label_status}"
}
%span
{
class:
"label #{label_status}"
}
=
hook_log
.
response_status
=
hook_log
.
response_status
app/views/shared/members/_member.html.haml
View file @
5e546f4b
...
@@ -17,7 +17,7 @@
...
@@ -17,7 +17,7 @@
%span
.badge.badge-success.prepend-left-5
It's you
%span
.badge.badge-success.prepend-left-5
It's you
-
if
user
.
blocked?
-
if
user
.
blocked?
%label
.badge.
label
-danger
%label
.badge.
badge
-danger
%strong
Blocked
%strong
Blocked
-
if
source
.
instance_of?
(
Group
)
&&
source
!=
@group
-
if
source
.
instance_of?
(
Group
)
&&
source
!=
@group
...
...
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