summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorClement Ho <ClemMakesApps@gmail.com>2018-04-13 14:34:22 -0500
committerClement Ho <ClemMakesApps@gmail.com>2018-04-13 14:34:22 -0500
commit4f6e6a24e766c281c2b1665e49c5a213ab5a3d7b (patch)
treea6fb112c4f21a413502039417d217a333e76a78a
parent21785171329ef0189a1c99d7b65b106b7bdda48c (diff)
downloadgitlab-ce-4f6e6a24e766c281c2b1665e49c5a213ab5a3d7b.tar.gz
[skip ci] label-warning => badge-warning
-rw-r--r--app/views/admin/projects/_projects.html.haml2
-rw-r--r--app/views/admin/runners/_runner.html.haml2
-rw-r--r--app/views/admin/runners/index.html.haml2
-rw-r--r--app/views/groups/projects.html.haml2
-rw-r--r--app/views/projects/generic_commit_statuses/_generic_commit_status.html.haml2
-rw-r--r--app/views/shared/projects/_project.html.haml2
6 files changed, 6 insertions, 6 deletions
diff --git a/app/views/admin/projects/_projects.html.haml b/app/views/admin/projects/_projects.html.haml
index 970c53a722f..00933d726d9 100644
--- a/app/views/admin/projects/_projects.html.haml
+++ b/app/views/admin/projects/_projects.html.haml
@@ -15,7 +15,7 @@
%span.badge.badge-pill
= storage_counter(project.statistics.storage_size)
- if project.archived
- %span.badge.label-warning archived
+ %span.badge.badge-warning archived
.title
= link_to [:admin, project.namespace.becomes(Namespace), project] do
.dash-project-avatar
diff --git a/app/views/admin/runners/_runner.html.haml b/app/views/admin/runners/_runner.html.haml
index 01a8fabe8ea..8db996b0c58 100644
--- a/app/views/admin/runners/_runner.html.haml
+++ b/app/views/admin/runners/_runner.html.haml
@@ -5,7 +5,7 @@
- else
%span.badge.label-info specific
- if runner.locked?
- %span.badge.label-warning locked
+ %span.badge.badge-warning locked
- unless runner.active?
%span.badge.label-danger paused
diff --git a/app/views/admin/runners/index.html.haml b/app/views/admin/runners/index.html.haml
index 9c6f32af39e..a18e3d2896e 100644
--- a/app/views/admin/runners/index.html.haml
+++ b/app/views/admin/runners/index.html.haml
@@ -20,7 +20,7 @@
%span.badge.label-info specific
\- Runner runs jobs from assigned projects
%li
- %span.badge.label-warning locked
+ %span.badge.badge-warning locked
\- Runner cannot be assigned to other projects
%li
%span.badge.label-danger paused
diff --git a/app/views/groups/projects.html.haml b/app/views/groups/projects.html.haml
index e3bb86b0a36..cd07b95155c 100644
--- a/app/views/groups/projects.html.haml
+++ b/app/views/groups/projects.html.haml
@@ -17,7 +17,7 @@
%strong= link_to project.full_name, project
.float-right
- if project.archived
- %span.badge.label-warning archived
+ %span.badge.badge-warning archived
%span.badge.badge-pill
= storage_counter(project.statistics.storage_size)
= link_to 'Members', project_project_members_path(project), id: "edit_#{dom_id(project)}", class: "btn btn-sm"
diff --git a/app/views/projects/generic_commit_statuses/_generic_commit_status.html.haml b/app/views/projects/generic_commit_statuses/_generic_commit_status.html.haml
index 74fdbc4dc7b..1bafcbde169 100644
--- a/app/views/projects/generic_commit_statuses/_generic_commit_status.html.haml
+++ b/app/views/projects/generic_commit_statuses/_generic_commit_status.html.haml
@@ -38,7 +38,7 @@
%span.badge.label-primary
= tag
- if retried
- %span.badge.label-warning retried
+ %span.badge.badge-warning retried
- if pipeline_link
%td
diff --git a/app/views/shared/projects/_project.html.haml b/app/views/shared/projects/_project.html.haml
index 925b7dde46c..88f0675f795 100644
--- a/app/views/shared/projects/_project.html.haml
+++ b/app/views/shared/projects/_project.html.haml
@@ -46,7 +46,7 @@
.controls
.prepend-top-0
- if project.archived
- %span.prepend-left-10.badge.label-warning archived
+ %span.prepend-left-10.badge.badge-warning archived
- if can?(current_user, :read_cross_project) && project.pipeline_status.has_status?
%span.prepend-left-10
= render_project_pipeline_status(project.pipeline_status)