diff options
author | Douwe Maan <douwe@gitlab.com> | 2016-10-19 23:41:04 +0300 |
---|---|---|
committer | Rémy Coutable <remy@rymai.me> | 2016-10-20 17:39:27 +0300 |
commit | c8b2b3f7c32db873f1bebce3e3b1847ea24d235f (patch) | |
tree | a8ee49b217785070d9eb88705f0fdd0b1a51bd90 /app/views/groups | |
parent | 52a38f907dfc0b0ae675faa90371cb7db87221bf (diff) |
Merge branch 'feature/group-level-labels' into 'master'
Add group level labels.
* `LabelsFinder`
* `Gitlab::Gfm::ReferenceRewriter`
* `Banzai::Filter::LabelReferenceFilter`
We'll be adding more feature that allow you to do cross-project management of issues.
loses #19997
See merge request !6425
Signed-off-by: Rémy Coutable <remy@rymai.me>
Diffstat (limited to 'app/views/groups')
-rw-r--r-- | app/views/groups/labels/destroy.js.haml | 2 | ||||
-rw-r--r-- | app/views/groups/labels/edit.html.haml | 7 | ||||
-rw-r--r-- | app/views/groups/labels/index.html.haml | 20 | ||||
-rw-r--r-- | app/views/groups/labels/new.html.haml | 8 |
4 files changed, 37 insertions, 0 deletions
diff --git a/app/views/groups/labels/destroy.js.haml b/app/views/groups/labels/destroy.js.haml new file mode 100644 index 00000000000..3dfbfc77c0d --- /dev/null +++ b/app/views/groups/labels/destroy.js.haml @@ -0,0 +1,2 @@ +- if @group.labels.empty? + $('.labels').load(document.URL + ' .nothing-here-block').hide().fadeIn(1000) diff --git a/app/views/groups/labels/edit.html.haml b/app/views/groups/labels/edit.html.haml new file mode 100644 index 00000000000..836981fc6fd --- /dev/null +++ b/app/views/groups/labels/edit.html.haml @@ -0,0 +1,7 @@ +- page_title 'Edit', @label.name, 'Labels' + +%h3.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 new file mode 100644 index 00000000000..70783a63409 --- /dev/null +++ b/app/views/groups/labels/index.html.haml @@ -0,0 +1,20 @@ +- page_title 'Labels' + +.top-area.adjust + .nav-text + Labels can be applied to issues and merge requests. Group labels are available for any project within the group. + + .nav-controls + - if can?(current_user, :admin_label, @group) + = link_to new_group_label_path(@group), class: "btn btn-new" do + New label + +.labels + .other-labels + - if @labels.present? + %ul.content-list.manage-labels-list.js-other-labels + = render partial: 'shared/label', collection: @labels, as: :label + = paginate @labels, theme: 'gitlab' + - else + .nothing-here-block + No labels created yet. diff --git a/app/views/groups/labels/new.html.haml b/app/views/groups/labels/new.html.haml new file mode 100644 index 00000000000..2be87460b1d --- /dev/null +++ b/app/views/groups/labels/new.html.haml @@ -0,0 +1,8 @@ +- page_title 'New Label' +- header_title group_title(@group, 'Labels', group_labels_path(@group)) + +%h3.page-title + New Label +%hr + += render 'shared/labels/form', url: group_labels_path, back_path: @previous_labels_path |