diff options
| author | GitLab Bot <gitlab-bot@gitlab.com> | 2022-06-06 12:08:32 +0000 |
|---|---|---|
| committer | GitLab Bot <gitlab-bot@gitlab.com> | 2022-06-06 12:08:32 +0000 |
| commit | 2e31a394c5857fdb845811685ca7fc79a2fb7540 (patch) | |
| tree | e0bfee190f52dcd69131ffc02b3790b86440bba3 /app/views/groups/labels | |
| parent | 900a0a5a4af50678df889f693ac4d226d2cf4f99 (diff) | |
| download | gitlab-ce-2e31a394c5857fdb845811685ca7fc79a2fb7540.tar.gz | |
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'app/views/groups/labels')
| -rw-r--r-- | app/views/groups/labels/edit.html.haml | 1 | ||||
| -rw-r--r-- | app/views/groups/labels/index.html.haml | 8 | ||||
| -rw-r--r-- | app/views/groups/labels/new.html.haml | 1 |
3 files changed, 4 insertions, 6 deletions
diff --git a/app/views/groups/labels/edit.html.haml b/app/views/groups/labels/edit.html.haml index bd0efa9d778..f6d7d958365 100644 --- a/app/views/groups/labels/edit.html.haml +++ b/app/views/groups/labels/edit.html.haml @@ -4,6 +4,5 @@ %h1.page-title = _('Edit Label') -%hr = render 'shared/labels/form', url: group_label_path(@group, @label), back_path: @previous_labels_path diff --git a/app/views/groups/labels/index.html.haml b/app/views/groups/labels/index.html.haml index c480123dad1..8187dda5471 100644 --- a/app/views/groups/labels/index.html.haml +++ b/app/views/groups/labels/index.html.haml @@ -8,13 +8,13 @@ #js-promote-label-modal = render 'shared/labels/nav', labels_or_filters: labels_or_filters, can_admin_label: can_admin_label - .labels-container.gl-mt-2.gl-bg-gray-10.gl-border-solid.gl-border-1.gl-border-gray-100 + .labels-container.gl-mt-5 - if @labels.any? - .text-muted + .text-muted.gl-mb-5 = _('Labels can be applied to %{features}. Group labels are available for any project within the group.') % { features: issuable_types.to_sentence } .other-labels - %h5= _('Labels') - %ul.content-list.manage-labels-list.js-other-labels + %h4= _('Labels') + %ul.manage-labels-list.js-other-labels = render partial: 'shared/label', collection: @labels, as: :label, locals: { use_label_priority: false, subject: @group } = paginate @labels, theme: 'gitlab' - elsif search.present? diff --git a/app/views/groups/labels/new.html.haml b/app/views/groups/labels/new.html.haml index 07e45cc05fb..534e2d13acf 100644 --- a/app/views/groups/labels/new.html.haml +++ b/app/views/groups/labels/new.html.haml @@ -4,6 +4,5 @@ %h1.page-title = _('New Label') -%hr = render 'shared/labels/form', url: group_labels_path, back_path: @previous_labels_path |