summaryrefslogtreecommitdiff
path: root/app/views/groups/labels
diff options
context:
space:
mode:
authorDouglas Barbosa Alexandre <dbalexandre@gmail.com>2016-09-29 01:03:28 -0300
committerDouglas Barbosa Alexandre <dbalexandre@gmail.com>2016-10-19 14:58:25 -0200
commit0bfa39d5bdb9f53bfc319b9351230b3eb405b619 (patch)
treed89e21ee24d1d421ce86c5bfdbbf43d699ace479 /app/views/groups/labels
parent07709c5576a06179c5365b0d7fe154c5f67ca7e5 (diff)
downloadgitlab-ce-0bfa39d5bdb9f53bfc319b9351230b3eb405b619.tar.gz
Remove scopes/types for labels
Diffstat (limited to 'app/views/groups/labels')
-rw-r--r--app/views/groups/labels/edit.html.haml3
-rw-r--r--app/views/groups/labels/index.html.haml8
-rw-r--r--app/views/groups/labels/new.html.haml5
3 files changed, 5 insertions, 11 deletions
diff --git a/app/views/groups/labels/edit.html.haml b/app/views/groups/labels/edit.html.haml
index e247393abd5..28471f407ad 100644
--- a/app/views/groups/labels/edit.html.haml
+++ b/app/views/groups/labels/edit.html.haml
@@ -1,8 +1,7 @@
- page_title 'Edit', @label.name, 'Labels'
%h3.page-title
- = icon('folder-open')
- Edit Group Label
+ Edit Label
%hr
= render 'form', url: group_label_path(@group, @label)
diff --git a/app/views/groups/labels/index.html.haml b/app/views/groups/labels/index.html.haml
index 8e93ea4f625..6c69e3465f4 100644
--- a/app/views/groups/labels/index.html.haml
+++ b/app/views/groups/labels/index.html.haml
@@ -10,13 +10,9 @@
New label
.labels
- - hide = @group.labels.empty? || (params[:page].present? && params[:page] != '1')
- .group-labels
- %h5{ class: ('hide' if hide) }
- = icon('folder-open')
- Group Labels
+ .other-labels
- if @labels.present?
- %ul.content-list.manage-labels-list.js-group-labels
+ %ul.content-list.manage-labels-list.js-other-labels
= render partial: 'shared/label', collection: @labels, as: :label
= paginate @labels, theme: 'gitlab'
- else
diff --git a/app/views/groups/labels/new.html.haml b/app/views/groups/labels/new.html.haml
index 01a50607db4..257ae97de03 100644
--- a/app/views/groups/labels/new.html.haml
+++ b/app/views/groups/labels/new.html.haml
@@ -1,9 +1,8 @@
-- page_title 'New Group Label'
+- page_title 'New Label'
- header_title group_title(@group, 'Labels', group_labels_path(@group))
%h3.page-title
- = icon('folder-open')
- New Group Label
+ New Label
%hr
= render 'form', url: group_labels_path