diff options
author | Clement Ho <ClemMakesApps@gmail.com> | 2018-04-13 14:37:07 -0500 |
---|---|---|
committer | Clement Ho <ClemMakesApps@gmail.com> | 2018-04-13 14:37:07 -0500 |
commit | 5e546f4bc8737319fee2a61a2ce2fc9340e40337 (patch) | |
tree | c42a25c17952a745b08f4463b2f81d8117c7cca4 | |
parent | e3de2ab1b5bc80a2f64d7391dacdddcb26f4ffbc (diff) | |
download | gitlab-ce-5e546f4bc8737319fee2a61a2ce2fc9340e40337.tar.gz |
[skip ci] label-danger => badge-danger
-rw-r--r-- | app/views/admin/runners/_runner.html.haml | 2 | ||||
-rw-r--r-- | app/views/admin/runners/index.html.haml | 2 | ||||
-rw-r--r-- | app/views/admin/users/_user.html.haml | 2 | ||||
-rw-r--r-- | app/views/import/bitbucket/status.html.haml | 2 | ||||
-rw-r--r-- | app/views/import/google_code/status.html.haml | 2 | ||||
-rw-r--r-- | app/views/projects/ci/builds/_build.html.haml | 2 | ||||
-rw-r--r-- | app/views/projects/pages/_list.html.haml | 2 | ||||
-rw-r--r-- | app/views/projects/pages_domains/show.html.haml | 2 | ||||
-rw-r--r-- | app/views/projects/runners/_index.html.haml | 2 | ||||
-rw-r--r-- | app/views/projects/triggers/_trigger.html.haml | 2 | ||||
-rw-r--r-- | app/views/search/results/_issue.html.haml | 2 | ||||
-rw-r--r-- | app/views/search/results/_merge_request.html.haml | 2 | ||||
-rw-r--r-- | app/views/shared/hook_logs/_status_label.html.haml | 2 | ||||
-rw-r--r-- | app/views/shared/members/_member.html.haml | 2 |
14 files changed, 14 insertions, 14 deletions
diff --git a/app/views/admin/runners/_runner.html.haml b/app/views/admin/runners/_runner.html.haml index f8d66cc42d8..b777c474100 100644 --- a/app/views/admin/runners/_runner.html.haml +++ b/app/views/admin/runners/_runner.html.haml @@ -7,7 +7,7 @@ - if runner.locked? %span.badge.badge-warning locked - unless runner.active? - %span.badge.label-danger paused + %span.badge.badge-danger paused %td = link_to admin_runner_path(runner) do diff --git a/app/views/admin/runners/index.html.haml b/app/views/admin/runners/index.html.haml index ea6c6134e20..5bb0fa31c41 100644 --- a/app/views/admin/runners/index.html.haml +++ b/app/views/admin/runners/index.html.haml @@ -23,7 +23,7 @@ %span.badge.badge-warning locked \- Runner cannot be assigned to other projects %li - %span.badge.label-danger paused + %span.badge.badge-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 6620af5f1ed..046be66c0f2 100644 --- a/app/views/admin/users/_user.html.haml +++ b/app/views/admin/users/_user.html.haml @@ -5,7 +5,7 @@ .user-name.row-title.str-truncated-100 = link_to user.name, [:admin, user] - if user.blocked? - %span.badge.label-danger blocked + %span.badge.badge-danger blocked - if user.admin? %span.badge.badge-success Admin - if user.external? diff --git a/app/views/import/bitbucket/status.html.haml b/app/views/import/bitbucket/status.html.haml index 45e354eddfe..4e8f715db4f 100644 --- a/app/views/import/bitbucket/status.html.haml +++ b/app/views/import/bitbucket/status.html.haml @@ -74,7 +74,7 @@ = link_to repo.full_name, "https://bitbucket.org/#{repo.full_name}", target: '_blank', rel: 'noopener noreferrer' %td.import-target %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? %p diff --git a/app/views/import/google_code/status.html.haml b/app/views/import/google_code/status.html.haml index bc61aeece72..acf7a108cb0 100644 --- a/app/views/import/google_code/status.html.haml +++ b/app/views/import/google_code/status.html.haml @@ -66,7 +66,7 @@ = link_to repo.name, "https://code.google.com/p/#{repo.name}", target: "_blank", rel: 'noopener noreferrer' %td.import-target %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? %p diff --git a/app/views/projects/ci/builds/_build.html.haml b/app/views/projects/ci/builds/_build.html.haml index 2bf96006ccd..90e696c6113 100644 --- a/app/views/projects/ci/builds/_build.html.haml +++ b/app/views/projects/ci/builds/_build.html.haml @@ -46,7 +46,7 @@ - if job.try(:trigger_request) %span.badge.label-info triggered - if job.try(:allow_failure) - %span.badge.label-danger allowed to fail + %span.badge.badge-danger allowed to fail - if job.action? %span.badge.label-info manual diff --git a/app/views/projects/pages/_list.html.haml b/app/views/projects/pages/_list.html.haml index 19142a625fd..ac0dce60e84 100644 --- a/app/views/projects/pages/_list.html.haml +++ b/app/views/projects/pages/_list.html.haml @@ -19,7 +19,7 @@ %p %span.badge.label-gray Certificate: #{domain.subject} - if domain.expired? - %span.badge.label-danger Expired + %span.badge.badge-danger Expired %div = 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" diff --git a/app/views/projects/pages_domains/show.html.haml b/app/views/projects/pages_domains/show.html.haml index 72dd6fbca90..821cf33fdf4 100644 --- a/app/views/projects/pages_domains/show.html.haml +++ b/app/views/projects/pages_domains/show.html.haml @@ -43,7 +43,7 @@ %td = form_tag verify_project_pages_domain_path(@project, @domain) do .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 } = text %button.btn.has-tooltip{ type: "submit", data: { container: 'body' }, title: _("Retry verification") } diff --git a/app/views/projects/runners/_index.html.haml b/app/views/projects/runners/_index.html.haml index 8f4891d0367..63dcf1fcc16 100644 --- a/app/views/projects/runners/_index.html.haml +++ b/app/views/projects/runners/_index.html.haml @@ -12,7 +12,7 @@ %span.badge.badge-success active \- Runner is active and can process any new jobs %li - %span.badge.label-danger paused + %span.badge.badge-danger paused \- Runner is paused and will not receive any new jobs %hr diff --git a/app/views/projects/triggers/_trigger.html.haml b/app/views/projects/triggers/_trigger.html.haml index f69e0cccc99..f6e966b1f84 100644 --- a/app/views/projects/triggers/_trigger.html.haml +++ b/app/views/projects/triggers/_trigger.html.haml @@ -10,7 +10,7 @@ - if trigger.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 + %span.badge.badge-danger.has-tooltip{ title: "Trigger user has insufficient permissions to project" } invalid %td - if trigger.description? && trigger.description.length > 15 diff --git a/app/views/search/results/_issue.html.haml b/app/views/search/results/_issue.html.haml index ccaa980b325..c413c3d4abb 100644 --- a/app/views/search/results/_issue.html.haml +++ b/app/views/search/results/_issue.html.haml @@ -4,7 +4,7 @@ = link_to [issue.project.namespace.becomes(Namespace), issue.project, issue] do %span.term.str-truncated= issue.title - if issue.closed? - %span.badge.label-danger.prepend-left-5 Closed + %span.badge.badge-danger.prepend-left-5 Closed .float-right ##{issue.iid} - if issue.description.present? .description.term diff --git a/app/views/search/results/_merge_request.html.haml b/app/views/search/results/_merge_request.html.haml index d4825e6b6ee..519176af108 100644 --- a/app/views/search/results/_merge_request.html.haml +++ b/app/views/search/results/_merge_request.html.haml @@ -5,7 +5,7 @@ - if merge_request.merged? %span.badge.badge-primary.prepend-left-5 Merged - 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 - if merge_request.description.present? .description.term diff --git a/app/views/shared/hook_logs/_status_label.html.haml b/app/views/shared/hook_logs/_status_label.html.haml index fd20d98187d..993880b7d6e 100644 --- a/app/views/shared/hook_logs/_status_label.html.haml +++ b/app/views/shared/hook_logs/_status_label.html.haml @@ -1,3 +1,3 @@ -- label_status = hook_log.success? ? 'badge-success' : 'label-danger' +- label_status = hook_log.success? ? 'badge-success' : 'badge-danger' %span{ class: "label #{label_status}" } = hook_log.response_status diff --git a/app/views/shared/members/_member.html.haml b/app/views/shared/members/_member.html.haml index 175ad2c8112..a96321bf4fb 100644 --- a/app/views/shared/members/_member.html.haml +++ b/app/views/shared/members/_member.html.haml @@ -17,7 +17,7 @@ %span.badge.badge-success.prepend-left-5 It's you - if user.blocked? - %label.badge.label-danger + %label.badge.badge-danger %strong Blocked - if source.instance_of?(Group) && source != @group |