summaryrefslogtreecommitdiff
path: root/app/views/admin
diff options
context:
space:
mode:
Diffstat (limited to 'app/views/admin')
-rw-r--r--app/views/admin/hook_logs/_index.html.haml2
-rw-r--r--app/views/admin/hooks/index.html.haml4
-rw-r--r--app/views/admin/projects/_projects.html.haml2
-rw-r--r--app/views/admin/runners/_runner.html.haml10
-rw-r--r--app/views/admin/runners/index.html.haml8
-rw-r--r--app/views/admin/users/_user.html.haml6
6 files changed, 16 insertions, 16 deletions
diff --git a/app/views/admin/hook_logs/_index.html.haml b/app/views/admin/hook_logs/_index.html.haml
index acb105b8080..d10826a20d2 100644
--- a/app/views/admin/hook_logs/_index.html.haml
+++ b/app/views/admin/hook_logs/_index.html.haml
@@ -19,7 +19,7 @@
%td
= render partial: 'shared/hook_logs/status_label', locals: { hook_log: hook_log }
%td.d-none.d-sm-block
- %span.label.label-gray.deploy-project-label
+ %span.badge.label-gray.deploy-project-label
= hook_log.trigger.singularize.titleize
%td
= truncate(hook_log.url, length: 50)
diff --git a/app/views/admin/hooks/index.html.haml b/app/views/admin/hooks/index.html.haml
index 02e4426b3a5..97600a566fe 100644
--- a/app/views/admin/hooks/index.html.haml
+++ b/app/views/admin/hooks/index.html.haml
@@ -29,7 +29,7 @@
%div
- SystemHook.triggers.each_value do |event|
- if hook.public_send(event)
- %span.label.label-gray= event.to_s.titleize
- %span.label.label-gray SSL Verification: #{hook.enable_ssl_verification ? 'enabled' : 'disabled'}
+ %span.badge.label-gray= event.to_s.titleize
+ %span.badge.label-gray SSL Verification: #{hook.enable_ssl_verification ? 'enabled' : 'disabled'}
= render 'shared/plugins/index'
diff --git a/app/views/admin/projects/_projects.html.haml b/app/views/admin/projects/_projects.html.haml
index 45e550c3645..970c53a722f 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.label.label-warning archived
+ %span.badge.label-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 2e70d16c64f..01a8fabe8ea 100644
--- a/app/views/admin/runners/_runner.html.haml
+++ b/app/views/admin/runners/_runner.html.haml
@@ -1,13 +1,13 @@
%tr{ id: dom_id(runner) }
%td
- if runner.shared?
- %span.label.label-success shared
+ %span.badge.label-success shared
- else
- %span.label.label-info specific
+ %span.badge.label-info specific
- if runner.locked?
- %span.label.label-warning locked
+ %span.badge.label-warning locked
- unless runner.active?
- %span.label.label-danger paused
+ %span.badge.label-danger paused
%td
= link_to admin_runner_path(runner) do
@@ -27,7 +27,7 @@
#{runner.builds.count(:all)}
%td
- runner.tag_list.sort.each do |tag|
- %span.label.label-primary
+ %span.badge.label-primary
= tag
%td
- if runner.contacted_at
diff --git a/app/views/admin/runners/index.html.haml b/app/views/admin/runners/index.html.haml
index 36d41a8bcf1..9c6f32af39e 100644
--- a/app/views/admin/runners/index.html.haml
+++ b/app/views/admin/runners/index.html.haml
@@ -14,16 +14,16 @@
%span Each Runner can be in one of the following states:
%ul
%li
- %span.label.label-success shared
+ %span.badge.label-success shared
\- Runner runs jobs from all unassigned projects
%li
- %span.label.label-info specific
+ %span.badge.label-info specific
\- Runner runs jobs from assigned projects
%li
- %span.label.label-warning locked
+ %span.badge.label-warning locked
\- Runner cannot be assigned to other projects
%li
- %span.label.label-danger paused
+ %span.badge.label-danger paused
\- Runner will not receive any new jobs
.bs-callout.clearfix
diff --git a/app/views/admin/users/_user.html.haml b/app/views/admin/users/_user.html.haml
index 2e57047b05d..796ad2cd69c 100644
--- a/app/views/admin/users/_user.html.haml
+++ b/app/views/admin/users/_user.html.haml
@@ -5,11 +5,11 @@
.user-name.row-title.str-truncated-100
= link_to user.name, [:admin, user]
- if user.blocked?
- %span.label.label-danger blocked
+ %span.badge.label-danger blocked
- if user.admin?
- %span.label.label-success Admin
+ %span.badge.label-success Admin
- if user.external?
- %span.label.label-default External
+ %span.badge.label-default External
- if user == current_user
%span It's you!
.row-second-line.str-truncated-100