diff options
author | GitLab Bot <gitlab-bot@gitlab.com> | 2020-10-20 09:09:03 +0300 |
---|---|---|
committer | GitLab Bot <gitlab-bot@gitlab.com> | 2020-10-20 09:09:03 +0300 |
commit | 99551d44588b9c815df9691c8e619eb8beaa0045 (patch) | |
tree | e1244297818b544c6837b2eefc58f1fe288b8b90 /app/helpers/labels_helper.rb | |
parent | fe75b57542f67ae643d42e9ab7f317cedb51df71 (diff) |
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'app/helpers/labels_helper.rb')
-rw-r--r-- | app/helpers/labels_helper.rb | 19 |
1 files changed, 0 insertions, 19 deletions
diff --git a/app/helpers/labels_helper.rb b/app/helpers/labels_helper.rb index 436af08ce01..312d535a92c 100644 --- a/app/helpers/labels_helper.rb +++ b/app/helpers/labels_helper.rb @@ -241,25 +241,6 @@ module LabelsHelper }.merge(opts) end - def sidebar_label_dropdown_data(issuable_type, issuable_sidebar) - label_dropdown_data(nil, { - default_label: "Labels", - field_name: "#{issuable_type}[label_names][]", - ability_name: issuable_type, - namespace_path: issuable_sidebar[:namespace_path], - project_path: issuable_sidebar[:project_path], - issue_update: issuable_sidebar[:issuable_json_path], - labels: issuable_sidebar[:project_labels_path], - display: 'static' - }) - end - - def label_from_hash(hash) - klass = hash[:group_id] ? GroupLabel : ProjectLabel - - klass.new(hash.slice(:color, :description, :title, :group_id, :project_id)) - end - def issuable_types ['issues', 'merge requests'] end |