From 52e0c3b565b7b177abbf8ea3bc573651060179a2 Mon Sep 17 00:00:00 2001
From: Douglas Barbosa Alexandre <dbalexandre@gmail.com>
Date: Mon, 19 Sep 2016 16:49:08 -0300
Subject: Add CRUD for Group Labels

---
 app/helpers/labels_helper.rb | 28 +++++++++++++++++++++++-----
 1 file changed, 23 insertions(+), 5 deletions(-)

(limited to 'app/helpers')

diff --git a/app/helpers/labels_helper.rb b/app/helpers/labels_helper.rb
index b9f3d6c75c2..540eb6dd493 100644
--- a/app/helpers/labels_helper.rb
+++ b/app/helpers/labels_helper.rb
@@ -43,11 +43,29 @@ module LabelsHelper
     end
   end
 
-  def label_filter_path(project, label, type: issue)
-    send("namespace_project_#{type.to_s.pluralize}_path",
-                project.namespace,
-                project,
-                label_name: [label.name])
+  def link_to_group_label(label, group: nil, type: :issue, tooltip: true, css_class: nil, &block)
+    group ||= @group || label.group
+    link = label_filter_path(group, label, type: type)
+
+    if block_given?
+      link_to link, class: css_class, &block
+    else
+      link_to render_colored_label(label, tooltip: tooltip), link, class: css_class
+    end
+  end
+
+  def label_filter_path(subject, label, type: issue)
+    case subject
+    when Project
+      send("namespace_project_#{type.to_s.pluralize}_path",
+                  subject.namespace,
+                  subject,
+                  label_name: [label.name])
+    when Group
+      send("#{type.to_s.pluralize}_group_path",
+                  subject,
+                  label_name: [label.name])
+    end
   end
 
   def project_label_names
-- 
cgit v1.2.3


From bdb7bf4b5188ffd68e54cbf671ba9ce1a4ffb1d1 Mon Sep 17 00:00:00 2001
From: Douglas Barbosa Alexandre <dbalexandre@gmail.com>
Date: Tue, 20 Sep 2016 00:09:57 -0300
Subject: List group labels on project labels page

---
 app/helpers/labels_helper.rb | 43 +++++++++++++++++++++++++++++++++++++++++++
 1 file changed, 43 insertions(+)

(limited to 'app/helpers')

diff --git a/app/helpers/labels_helper.rb b/app/helpers/labels_helper.rb
index 540eb6dd493..3f0e502fbc9 100644
--- a/app/helpers/labels_helper.rb
+++ b/app/helpers/labels_helper.rb
@@ -68,6 +68,49 @@ module LabelsHelper
     end
   end
 
+  def can_admin_label(label)
+    subject =
+      case label
+      when GroupLabel then label.group
+      else label.project
+      end
+
+    can?(current_user, :admin_label, subject)
+  end
+
+  def edit_label_path(label)
+    case label
+    when GroupLabel then edit_group_label_path(label.group, label)
+    else edit_namespace_project_label_path(label.project.namespace, label.project, label)
+    end
+  end
+
+  def destroy_label_path(label)
+    case label
+    when GroupLabel then group_label_path(label.group, label)
+    else namespace_project_label_path(label.project.namespace, label.project, label)
+    end
+  end
+
+  def label_type_icon(label, options = {})
+    title, icon =
+      case label
+      when GroupLabel then ['Group', 'folder-open']
+      else ['Project', 'bookmark']
+      end
+
+    options[:class] ||= ''
+    options[:class] << ' has-tooltip js-label-type'
+
+    content_tag :span,
+      class: options[:class],
+      data: { 'placement' => 'top' },
+      title: title,
+      aria: { label: title } do
+      icon(icon, base: true)
+    end
+  end
+
   def project_label_names
     @project.labels.pluck(:title)
   end
-- 
cgit v1.2.3


From 7f2e29ff3da54c4525dc55b4447fea2963e17fd3 Mon Sep 17 00:00:00 2001
From: Douglas Barbosa Alexandre <dbalexandre@gmail.com>
Date: Tue, 20 Sep 2016 00:18:50 -0300
Subject: Remove unused method LabelsHelper#project_label_names

---
 app/helpers/labels_helper.rb | 4 ----
 1 file changed, 4 deletions(-)

(limited to 'app/helpers')

diff --git a/app/helpers/labels_helper.rb b/app/helpers/labels_helper.rb
index 3f0e502fbc9..9df8d37af9e 100644
--- a/app/helpers/labels_helper.rb
+++ b/app/helpers/labels_helper.rb
@@ -111,10 +111,6 @@ module LabelsHelper
     end
   end
 
-  def project_label_names
-    @project.labels.pluck(:title)
-  end
-
   def render_colored_label(label, label_suffix = '', tooltip: true)
     label_color = label.color || Label::DEFAULT_COLOR
     text_color = text_color_for_bg(label_color)
-- 
cgit v1.2.3


From b10e5764ac0765b556d64dfebb9dad948154e31a Mon Sep 17 00:00:00 2001
From: Douglas Barbosa Alexandre <dbalexandre@gmail.com>
Date: Tue, 20 Sep 2016 11:55:31 -0300
Subject: List only labels that belongs to the group on the group issues page

---
 app/helpers/labels_helper.rb | 3 +++
 1 file changed, 3 insertions(+)

(limited to 'app/helpers')

diff --git a/app/helpers/labels_helper.rb b/app/helpers/labels_helper.rb
index 9df8d37af9e..8e5321c05fa 100644
--- a/app/helpers/labels_helper.rb
+++ b/app/helpers/labels_helper.rb
@@ -172,7 +172,10 @@ module LabelsHelper
   end
 
   def labels_filter_path
+    return group_labels_path(@group, :json) if @group
+
     project = @target_project || @project
+
     if project
       namespace_project_labels_path(project.namespace, project, :json)
     else
-- 
cgit v1.2.3


From 2910896b53f107558904e228340009bb9fccca4e Mon Sep 17 00:00:00 2001
From: Douglas Barbosa Alexandre <dbalexandre@gmail.com>
Date: Tue, 20 Sep 2016 13:54:29 -0300
Subject: Remove duplication between global and the regular label partials

---
 app/helpers/labels_helper.rb | 52 ++++++++++++++++++++------------------------
 1 file changed, 23 insertions(+), 29 deletions(-)

(limited to 'app/helpers')

diff --git a/app/helpers/labels_helper.rb b/app/helpers/labels_helper.rb
index 8e5321c05fa..65fc460c670 100644
--- a/app/helpers/labels_helper.rb
+++ b/app/helpers/labels_helper.rb
@@ -4,9 +4,8 @@ module LabelsHelper
   # Link to a Label
   #
   # label   - Label object to link to
-  # project - Project object which will be used as the context for the label's
-  #           link. If omitted, defaults to `@project`, or the label's own
-  #           project.
+  # subject - Project/Group object which will be used as the context for the
+  #           label's link. If omitted, defaults to the label's own group/project.
   # type    - The type of item the link will point to (:issue or
   #           :merge_request). If omitted, defaults to :issue.
   # block   - An optional block that will be passed to `link_to`, forming the
@@ -18,12 +17,11 @@ module LabelsHelper
   #   # Allow the generated link to use the label's own project
   #   link_to_label(label)
   #
-  #   # Force the generated link to use @project
-  #   @project = Project.first
-  #   link_to_label(label)
+  #   # Force the generated link to use a provided group
+  #   link_to_label(label, subject: Group.last)
   #
   #   # Force the generated link to use a provided project
-  #   link_to_label(label, project: Project.last)
+  #   link_to_label(label, subject: Project.last)
   #
   #   # Force the generated link to point to merge requests instead of issues
   #   link_to_label(label, type: :merge_request)
@@ -32,9 +30,8 @@ module LabelsHelper
   #   link_to_label(label) { "My Custom Label Text" }
   #
   # Returns a String
-  def link_to_label(label, project: nil, type: :issue, tooltip: true, css_class: nil, &block)
-    project ||= @project || label.project
-    link = label_filter_path(project, label, type: type)
+  def link_to_label(label, subject: nil, type: :issue, tooltip: true, css_class: nil, &block)
+    link = label_filter_path(label, type: type)
 
     if block_given?
       link_to link, class: css_class, &block
@@ -43,27 +40,16 @@ module LabelsHelper
     end
   end
 
-  def link_to_group_label(label, group: nil, type: :issue, tooltip: true, css_class: nil, &block)
-    group ||= @group || label.group
-    link = label_filter_path(group, label, type: type)
-
-    if block_given?
-      link_to link, class: css_class, &block
+  def label_filter_path(label, type: issue)
+    case label
+    when GroupLabel
+      send("#{type.to_s.pluralize}_group_path",
+                  label.group,
+                  label_name: [label.name])
     else
-      link_to render_colored_label(label, tooltip: tooltip), link, class: css_class
-    end
-  end
-
-  def label_filter_path(subject, label, type: issue)
-    case subject
-    when Project
       send("namespace_project_#{type.to_s.pluralize}_path",
-                  subject.namespace,
-                  subject,
-                  label_name: [label.name])
-    when Group
-      send("#{type.to_s.pluralize}_group_path",
-                  subject,
+                  label.project.namespace,
+                  label.project,
                   label_name: [label.name])
     end
   end
@@ -92,6 +78,13 @@ module LabelsHelper
     end
   end
 
+  def toggle_subscription_label_path(label)
+    case label
+    when GroupLabel then toggle_subscription_group_label_path(label.group, label)
+    else toggle_subscription_namespace_project_label_path(label.project.namespace, label.project, label)
+    end
+  end
+
   def label_type_icon(label, options = {})
     title, icon =
       case label
@@ -101,6 +94,7 @@ module LabelsHelper
 
     options[:class] ||= ''
     options[:class] << ' has-tooltip js-label-type'
+    options[:class] << ' hidden' if options.fetch(:hidden, false)
 
     content_tag :span,
       class: options[:class],
-- 
cgit v1.2.3


From 32c663ff248f6ad2f2fa10fd2e81d6535fb88fd6 Mon Sep 17 00:00:00 2001
From: Douglas Barbosa Alexandre <dbalexandre@gmail.com>
Date: Tue, 20 Sep 2016 15:50:11 -0300
Subject: Use policies to handle with global/project label permissions

---
 app/helpers/labels_helper.rb | 10 ----------
 1 file changed, 10 deletions(-)

(limited to 'app/helpers')

diff --git a/app/helpers/labels_helper.rb b/app/helpers/labels_helper.rb
index 65fc460c670..c14caa5e387 100644
--- a/app/helpers/labels_helper.rb
+++ b/app/helpers/labels_helper.rb
@@ -54,16 +54,6 @@ module LabelsHelper
     end
   end
 
-  def can_admin_label(label)
-    subject =
-      case label
-      when GroupLabel then label.group
-      else label.project
-      end
-
-    can?(current_user, :admin_label, subject)
-  end
-
   def edit_label_path(label)
     case label
     when GroupLabel then edit_group_label_path(label.group, label)
-- 
cgit v1.2.3


From cfedd42badc6b84457d1de35cb31988777462d5a Mon Sep 17 00:00:00 2001
From: Douglas Barbosa Alexandre <dbalexandre@gmail.com>
Date: Tue, 20 Sep 2016 17:07:56 -0300
Subject: Add ProjectLabel model

---
 app/helpers/labels_helper.rb | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

(limited to 'app/helpers')

diff --git a/app/helpers/labels_helper.rb b/app/helpers/labels_helper.rb
index c14caa5e387..844bd3fd183 100644
--- a/app/helpers/labels_helper.rb
+++ b/app/helpers/labels_helper.rb
@@ -57,21 +57,21 @@ module LabelsHelper
   def edit_label_path(label)
     case label
     when GroupLabel then edit_group_label_path(label.group, label)
-    else edit_namespace_project_label_path(label.project.namespace, label.project, label)
+    when ProjectLabel then edit_namespace_project_label_path(label.project.namespace, label.project, label)
     end
   end
 
   def destroy_label_path(label)
     case label
     when GroupLabel then group_label_path(label.group, label)
-    else namespace_project_label_path(label.project.namespace, label.project, label)
+    when ProjectLabel then namespace_project_label_path(label.project.namespace, label.project, label)
     end
   end
 
   def toggle_subscription_label_path(label)
     case label
     when GroupLabel then toggle_subscription_group_label_path(label.group, label)
-    else toggle_subscription_namespace_project_label_path(label.project.namespace, label.project, label)
+    when ProjectLabel then toggle_subscription_namespace_project_label_path(label.project.namespace, label.project, label)
     end
   end
 
@@ -79,7 +79,7 @@ module LabelsHelper
     title, icon =
       case label
       when GroupLabel then ['Group', 'folder-open']
-      else ['Project', 'bookmark']
+      when ProjectLabel then ['Project', 'bookmark']
       end
 
     options[:class] ||= ''
-- 
cgit v1.2.3


From b654229dcd3e4460ad7305ee7714395f044a72aa Mon Sep 17 00:00:00 2001
From: Douglas Barbosa Alexandre <dbalexandre@gmail.com>
Date: Mon, 26 Sep 2016 19:58:36 -0300
Subject: Fix LabelsHelper#link_to_label to use the subject argument

---
 app/helpers/labels_helper.rb | 22 ++++++++++++++--------
 1 file changed, 14 insertions(+), 8 deletions(-)

(limited to 'app/helpers')

diff --git a/app/helpers/labels_helper.rb b/app/helpers/labels_helper.rb
index 844bd3fd183..e26e82c6448 100644
--- a/app/helpers/labels_helper.rb
+++ b/app/helpers/labels_helper.rb
@@ -31,7 +31,13 @@ module LabelsHelper
   #
   # Returns a String
   def link_to_label(label, subject: nil, type: :issue, tooltip: true, css_class: nil, &block)
-    link = label_filter_path(label, type: type)
+    subject ||=
+      case label
+      when GroupLabel then label.group
+      when ProjectLabel then label.project
+      end
+
+    link = label_filter_path(subject, label, type: type)
 
     if block_given?
       link_to link, class: css_class, &block
@@ -40,16 +46,16 @@ module LabelsHelper
     end
   end
 
-  def label_filter_path(label, type: issue)
-    case label
-    when GroupLabel
+  def label_filter_path(subject, label, type: issue)
+    case subject
+    when Group
       send("#{type.to_s.pluralize}_group_path",
-                  label.group,
+                  subject,
                   label_name: [label.name])
-    else
+    when Project
       send("namespace_project_#{type.to_s.pluralize}_path",
-                  label.project.namespace,
-                  label.project,
+                  subject.namespace,
+                  subject,
                   label_name: [label.name])
     end
   end
-- 
cgit v1.2.3


From 07709c5576a06179c5365b0d7fe154c5f67ca7e5 Mon Sep 17 00:00:00 2001
From: Douglas Barbosa Alexandre <dbalexandre@gmail.com>
Date: Thu, 29 Sep 2016 00:21:47 -0300
Subject: Unfold references for group labels when moving issue to another
 project

---
 app/helpers/labels_helper.rb | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'app/helpers')

diff --git a/app/helpers/labels_helper.rb b/app/helpers/labels_helper.rb
index e26e82c6448..6d0d33b84fb 100644
--- a/app/helpers/labels_helper.rb
+++ b/app/helpers/labels_helper.rb
@@ -115,8 +115,8 @@ module LabelsHelper
     span.html_safe
   end
 
-  def render_colored_cross_project_label(label, tooltip: true)
-    label_suffix = label.project.name_with_namespace
+  def render_colored_cross_project_label(label, source_project = nil, tooltip: true)
+    label_suffix = source_project ? source_project.name_with_namespace : label.project.name_with_namespace
     label_suffix = " <i>in #{escape_once(label_suffix)}</i>"
     render_colored_label(label, label_suffix, tooltip: tooltip)
   end
-- 
cgit v1.2.3


From 0bfa39d5bdb9f53bfc319b9351230b3eb405b619 Mon Sep 17 00:00:00 2001
From: Douglas Barbosa Alexandre <dbalexandre@gmail.com>
Date: Thu, 29 Sep 2016 01:03:28 -0300
Subject: Remove scopes/types for labels

---
 app/helpers/labels_helper.rb | 20 --------------------
 1 file changed, 20 deletions(-)

(limited to 'app/helpers')

diff --git a/app/helpers/labels_helper.rb b/app/helpers/labels_helper.rb
index 6d0d33b84fb..e8992c114b0 100644
--- a/app/helpers/labels_helper.rb
+++ b/app/helpers/labels_helper.rb
@@ -81,26 +81,6 @@ module LabelsHelper
     end
   end
 
-  def label_type_icon(label, options = {})
-    title, icon =
-      case label
-      when GroupLabel then ['Group', 'folder-open']
-      when ProjectLabel then ['Project', 'bookmark']
-      end
-
-    options[:class] ||= ''
-    options[:class] << ' has-tooltip js-label-type'
-    options[:class] << ' hidden' if options.fetch(:hidden, false)
-
-    content_tag :span,
-      class: options[:class],
-      data: { 'placement' => 'top' },
-      title: title,
-      aria: { label: title } do
-      icon(icon, base: true)
-    end
-  end
-
   def render_colored_label(label, label_suffix = '', tooltip: true)
     label_color = label.color || Label::DEFAULT_COLOR
     text_color = text_color_for_bg(label_color)
-- 
cgit v1.2.3


From 73bfc15cd4fc681015e84f7db8507e38e4ca8b59 Mon Sep 17 00:00:00 2001
From: Douglas Barbosa Alexandre <dbalexandre@gmail.com>
Date: Tue, 11 Oct 2016 14:18:21 -0300
Subject: Always use symbols for type on LabelsHelper#link_to_label

---
 app/helpers/labels_helper.rb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'app/helpers')

diff --git a/app/helpers/labels_helper.rb b/app/helpers/labels_helper.rb
index e8992c114b0..af8741f5e06 100644
--- a/app/helpers/labels_helper.rb
+++ b/app/helpers/labels_helper.rb
@@ -46,7 +46,7 @@ module LabelsHelper
     end
   end
 
-  def label_filter_path(subject, label, type: issue)
+  def label_filter_path(subject, label, type: :issue)
     case subject
     when Group
       send("#{type.to_s.pluralize}_group_path",
-- 
cgit v1.2.3


From 8379fbcd47930320bf4dd6a3ac41c6efd427a91a Mon Sep 17 00:00:00 2001
From: Douglas Barbosa Alexandre <dbalexandre@gmail.com>
Date: Mon, 17 Oct 2016 17:48:46 -0200
Subject: Add subject to group and projects labels which return group/project

---
 app/helpers/labels_helper.rb | 10 ++--------
 1 file changed, 2 insertions(+), 8 deletions(-)

(limited to 'app/helpers')

diff --git a/app/helpers/labels_helper.rb b/app/helpers/labels_helper.rb
index af8741f5e06..a1d7713b45f 100644
--- a/app/helpers/labels_helper.rb
+++ b/app/helpers/labels_helper.rb
@@ -14,7 +14,7 @@ module LabelsHelper
   #
   # Examples:
   #
-  #   # Allow the generated link to use the label's own project
+  #   # Allow the generated link to use the label's own subject
   #   link_to_label(label)
   #
   #   # Force the generated link to use a provided group
@@ -31,13 +31,7 @@ module LabelsHelper
   #
   # Returns a String
   def link_to_label(label, subject: nil, type: :issue, tooltip: true, css_class: nil, &block)
-    subject ||=
-      case label
-      when GroupLabel then label.group
-      when ProjectLabel then label.project
-      end
-
-    link = label_filter_path(subject, label, type: type)
+    link = label_filter_path(subject || label.subject, label, type: type)
 
     if block_given?
       link_to link, class: css_class, &block
-- 
cgit v1.2.3


From 4c9241075dc1b2f1cda5648cf9ad1f553db3d03b Mon Sep 17 00:00:00 2001
From: Douglas Barbosa Alexandre <dbalexandre@gmail.com>
Date: Tue, 18 Oct 2016 01:32:00 -0200
Subject: Warn user deleting a group label affect all projects within the group

---
 app/helpers/labels_helper.rb | 7 +++++++
 1 file changed, 7 insertions(+)

(limited to 'app/helpers')

diff --git a/app/helpers/labels_helper.rb b/app/helpers/labels_helper.rb
index a1d7713b45f..d7cfd24c918 100644
--- a/app/helpers/labels_helper.rb
+++ b/app/helpers/labels_helper.rb
@@ -155,6 +155,13 @@ module LabelsHelper
     label.subscribed?(current_user) ? 'Unsubscribe' : 'Subscribe'
   end
 
+  def label_deletion_confirm_text(label)
+    case label
+    when GroupLabel then 'Remove this label? This will affect all projects within the group. Are you sure?'
+    when ProjectLabel then 'Remove this label? Are you sure?'
+    end
+  end
+
   # Required for Banzai::Filter::LabelReferenceFilter
   module_function :render_colored_label, :render_colored_cross_project_label,
                   :text_color_for_bg, :escape_once
-- 
cgit v1.2.3


From 355389d065216739a2b8e8150a1a569c410f4ff6 Mon Sep 17 00:00:00 2001
From: Douglas Barbosa Alexandre <dbalexandre@gmail.com>
Date: Wed, 19 Oct 2016 11:31:08 -0200
Subject: Disable subscribing to group-level labels

---
 app/helpers/labels_helper.rb | 21 ++++++++++++++-------
 1 file changed, 14 insertions(+), 7 deletions(-)

(limited to 'app/helpers')

diff --git a/app/helpers/labels_helper.rb b/app/helpers/labels_helper.rb
index d7cfd24c918..221a84b042f 100644
--- a/app/helpers/labels_helper.rb
+++ b/app/helpers/labels_helper.rb
@@ -68,11 +68,12 @@ module LabelsHelper
     end
   end
 
-  def toggle_subscription_label_path(label)
-    case label
-    when GroupLabel then toggle_subscription_group_label_path(label.group, label)
-    when ProjectLabel then toggle_subscription_namespace_project_label_path(label.project.namespace, label.project, label)
-    end
+  def toggle_subscription_data(label)
+    return unless label.is_a?(ProjectLabel)
+
+    {
+      url: toggle_subscription_namespace_project_label_path(label.project.namespace, label.project, label)
+    }
   end
 
   def render_colored_label(label, label_suffix = '', tooltip: true)
@@ -148,11 +149,17 @@ module LabelsHelper
   end
 
   def label_subscription_status(label)
-    label.subscribed?(current_user) ? 'subscribed' : 'unsubscribed'
+    case label
+    when GroupLabel then 'Subscribing to group labels is currently not supported.'
+    when ProjectLabel then label.subscribed?(current_user) ? 'subscribed' : 'unsubscribed'
+    end
   end
 
   def label_subscription_toggle_button_text(label)
-    label.subscribed?(current_user) ? 'Unsubscribe' : 'Subscribe'
+    case label
+    when GroupLabel then 'Subscribing to group labels is currently not supported.'
+    when ProjectLabel then label.subscribed?(current_user) ? 'Unsubscribe' : 'Subscribe'
+    end
   end
 
   def label_deletion_confirm_text(label)
-- 
cgit v1.2.3