diff options
author | Filipa Lacerda <filipa@gitlab.com> | 2017-05-26 15:32:36 +0000 |
---|---|---|
committer | Filipa Lacerda <filipa@gitlab.com> | 2017-05-26 15:32:36 +0000 |
commit | 48e7604677cb79efabc6fdbdeaa6d5c477c892ef (patch) | |
tree | 1ce29eca0403c95328f09d005d3b38ec06ff4f7f /app | |
parent | bd259d6bab4b3c9856be6c3d2e0c16e0836c9380 (diff) | |
parent | ed6bf343c81941207933b00ba04dbbe7ecd1f4d4 (diff) | |
download | gitlab-ce-48e7604677cb79efabc6fdbdeaa6d5c477c892ef.tar.gz |
Merge branch 'issuable-form-create-label-sub-groups' into 'master'
Fixed create new label form in issue form not working for sub-group projects
Closes #32906
See merge request !11703
Diffstat (limited to 'app')
-rw-r--r-- | app/views/shared/issuable/_label_dropdown.html.haml | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/app/views/shared/issuable/_label_dropdown.html.haml b/app/views/shared/issuable/_label_dropdown.html.haml index 93c7fa0c7d6..1cf662e29c4 100644 --- a/app/views/shared/issuable/_label_dropdown.html.haml +++ b/app/views/shared/issuable/_label_dropdown.html.haml @@ -9,7 +9,7 @@ - selected = local_assigns.fetch(:selected, nil) - selected_toggle = local_assigns.fetch(:selected_toggle, nil) - dropdown_title = local_assigns.fetch(:dropdown_title, "Filter by label") -- dropdown_data = {toggle: 'dropdown', field_name: "label_name[]", show_no: "true", show_any: "true", namespace_path: @project.try(:namespace).try(:path), project_path: @project.try(:path), labels: labels_filter_path, default_label: "Labels"} +- dropdown_data = {toggle: 'dropdown', field_name: "label_name[]", show_no: "true", show_any: "true", namespace_path: @project.try(:namespace).try(:full_path), project_path: @project.try(:path), labels: labels_filter_path, default_label: "Labels"} - dropdown_data.merge!(data_options) - classes << 'js-extra-options' if extra_options - classes << 'js-filter-submit' if filter_submit |