diff options
author | Clement Ho <ClemMakesApps@gmail.com> | 2018-04-13 14:35:23 -0500 |
---|---|---|
committer | Clement Ho <ClemMakesApps@gmail.com> | 2018-04-13 14:35:23 -0500 |
commit | ed696df59de0191de7274752e39b3c37727d5c4f (patch) | |
tree | 04371a342e8fcb71127b4c13ca0cab2eead837fb /app/views | |
parent | 4f6e6a24e766c281c2b1665e49c5a213ab5a3d7b (diff) | |
download | gitlab-ce-ed696df59de0191de7274752e39b3c37727d5c4f.tar.gz |
[skip ci] label-primary => badge-primary
Diffstat (limited to 'app/views')
-rw-r--r-- | app/views/admin/runners/_runner.html.haml | 2 | ||||
-rw-r--r-- | app/views/projects/branches/_branch.html.haml | 2 | ||||
-rw-r--r-- | app/views/projects/ci/builds/_build.html.haml | 2 | ||||
-rw-r--r-- | app/views/projects/generic_commit_statuses/_generic_commit_status.html.haml | 2 | ||||
-rw-r--r-- | app/views/projects/jobs/show.html.haml | 2 | ||||
-rw-r--r-- | app/views/projects/runners/_runner.html.haml | 2 | ||||
-rw-r--r-- | app/views/projects/runners/show.html.haml | 2 | ||||
-rw-r--r-- | app/views/projects/triggers/_content.html.haml | 2 | ||||
-rw-r--r-- | app/views/projects/triggers/_trigger.html.haml | 2 | ||||
-rw-r--r-- | app/views/search/results/_merge_request.html.haml | 2 |
10 files changed, 10 insertions, 10 deletions
diff --git a/app/views/admin/runners/_runner.html.haml b/app/views/admin/runners/_runner.html.haml index 8db996b0c58..b9ef0e967da 100644 --- a/app/views/admin/runners/_runner.html.haml +++ b/app/views/admin/runners/_runner.html.haml @@ -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 diff --git a/app/views/projects/branches/_branch.html.haml b/app/views/projects/branches/_branch.html.haml index 6042b3a8cba..2b93ed30e69 100644 --- a/app/views/projects/branches/_branch.html.haml +++ b/app/views/projects/branches/_branch.html.haml @@ -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') diff --git a/app/views/projects/ci/builds/_build.html.haml b/app/views/projects/ci/builds/_build.html.haml index 88c09b38554..2bf96006ccd 100644 --- a/app/views/projects/ci/builds/_build.html.haml +++ b/app/views/projects/ci/builds/_build.html.haml @@ -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 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 1bafcbde169..639efd34a74 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 @@ -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 diff --git a/app/views/projects/jobs/show.html.haml b/app/views/projects/jobs/show.html.haml index 2e184c0ebe1..ec9a04c0eab 100644 --- a/app/views/projects/jobs/show.html.haml +++ b/app/views/projects/jobs/show.html.haml @@ -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. diff --git a/app/views/projects/runners/_runner.html.haml b/app/views/projects/runners/_runner.html.haml index 40e6bb851b4..955300685b2 100644 --- a/app/views/projects/runners/_runner.html.haml +++ b/app/views/projects/runners/_runner.html.haml @@ -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 diff --git a/app/views/projects/runners/show.html.haml b/app/views/projects/runners/show.html.haml index e6bc35a1948..db7b7eb693d 100644 --- a/app/views/projects/runners/show.html.haml +++ b/app/views/projects/runners/show.html.haml @@ -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 diff --git a/app/views/projects/triggers/_content.html.haml b/app/views/projects/triggers/_content.html.haml index 25b22b71a0a..96a41aa066c 100644 --- a/app/views/projects/triggers/_content.html.haml +++ b/app/views/projects/triggers/_content.html.haml @@ -1,6 +1,6 @@ %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 diff --git a/app/views/projects/triggers/_trigger.html.haml b/app/views/projects/triggers/_trigger.html.haml index 6154a01c123..f69e0cccc99 100644 --- a/app/views/projects/triggers/_trigger.html.haml +++ b/app/views/projects/triggers/_trigger.html.haml @@ -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 diff --git a/app/views/search/results/_merge_request.html.haml b/app/views/search/results/_merge_request.html.haml index 44ee512d5a8..d4825e6b6ee 100644 --- a/app/views/search/results/_merge_request.html.haml +++ b/app/views/search/results/_merge_request.html.haml @@ -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 |