diff options
| author | Rémy Coutable <remy@rymai.me> | 2017-05-03 15:19:29 +0000 |
|---|---|---|
| committer | Rémy Coutable <remy@rymai.me> | 2017-05-03 15:19:29 +0000 |
| commit | b4176bbaaf94c66f680dac8c21460a2f80b224b2 (patch) | |
| tree | fc7c521295ec996cce84fac684d0f5a7ab11ea31 /app/views | |
| parent | c45e11f1798282e73627cb035dc7ad31c6416ec2 (diff) | |
| parent | c99075e0d30560d347423a6de7b5f45e9ab73f3a (diff) | |
| download | gitlab-ce-b4176bbaaf94c66f680dac8c21460a2f80b224b2.tar.gz | |
Merge branch '30667-creating-new-label-on-new-issue-causing-bug' into 'master'
Fix label creation from issuable for subgroup projects
Closes #30667
See merge request !11011
Diffstat (limited to 'app/views')
| -rw-r--r-- | app/views/shared/issuable/_sidebar.html.haml | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/app/views/shared/issuable/_sidebar.html.haml b/app/views/shared/issuable/_sidebar.html.haml index 45065ac5920..bc638e994f3 100644 --- a/app/views/shared/issuable/_sidebar.html.haml +++ b/app/views/shared/issuable/_sidebar.html.haml @@ -136,7 +136,7 @@ - selected_labels.each do |label| = hidden_field_tag "#{issuable.to_ability_name}[label_names][]", label.id, id: nil .dropdown - %button.dropdown-menu-toggle.js-label-select.js-multiselect.js-label-sidebar-dropdown{ type: "button", data: {toggle: "dropdown", default_label: "Labels", field_name: "#{issuable.to_ability_name}[label_names][]", ability_name: issuable.to_ability_name, show_no: "true", show_any: "true", namespace_path: @project.try(:namespace).try(:path), project_path: @project.try(:path), issue_update: issuable_json_path(issuable), labels: (namespace_project_labels_path(@project.namespace, @project, :json) if @project) } } + %button.dropdown-menu-toggle.js-label-select.js-multiselect.js-label-sidebar-dropdown{ type: "button", data: {toggle: "dropdown", default_label: "Labels", field_name: "#{issuable.to_ability_name}[label_names][]", ability_name: issuable.to_ability_name, show_no: "true", show_any: "true", namespace_path: @project.try(:namespace).try(:full_path), project_path: @project.try(:path), issue_update: issuable_json_path(issuable), labels: (namespace_project_labels_path(@project.namespace, @project, :json) if @project) } } %span.dropdown-toggle-text{ class: ("is-default" if selected_labels.empty?) } = multi_label_name(selected_labels, "Labels") = icon('chevron-down', 'aria-hidden': 'true') |