diff options
| author | Mike Greiling <mike@pixelcog.com> | 2017-10-24 07:52:21 +0000 |
|---|---|---|
| committer | Mike Greiling <mike@pixelcog.com> | 2017-10-24 07:52:21 +0000 |
| commit | f7bdfe5098c9a5a3a426344ba1d7dd668212cf7e (patch) | |
| tree | 5a1cb2a90b0a2b5114f6f23712b68724b3e8a7e0 /app/views/shared/boards/components/sidebar/_labels.html.haml | |
| parent | 9cd528aa7ac5066570cb50b909951a6c6b723935 (diff) | |
| parent | e16add2267648d3d3ef1d98f9b53f67a29428791 (diff) | |
| download | gitlab-ce-f7bdfe5098c9a5a3a426344ba1d7dd668212cf7e.tar.gz | |
Merge branch 'master' into 'es-module-autosave'es-module-autosave
# Conflicts:
# app/assets/javascripts/issuable_form.js
# app/assets/javascripts/notes.js
Diffstat (limited to 'app/views/shared/boards/components/sidebar/_labels.html.haml')
| -rw-r--r-- | app/views/shared/boards/components/sidebar/_labels.html.haml | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/app/views/shared/boards/components/sidebar/_labels.html.haml b/app/views/shared/boards/components/sidebar/_labels.html.haml index 1f540bdaf93..dfc0f9be321 100644 --- a/app/views/shared/boards/components/sidebar/_labels.html.haml +++ b/app/views/shared/boards/components/sidebar/_labels.html.haml @@ -25,7 +25,7 @@ show_any: "true", project_id: @project&.try(:id), labels: labels_filter_path(false), - namespace_path: @project.try(:namespace).try(:full_path), + namespace_path: @namespace_path, project_path: @project.try(:path) }, ":data-issue-update" => "'#{build_issue_link_base}/' + issue.iid + '.json'" } %span.dropdown-toggle-text |