summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorWinnie Hellmann <winnie@gitlab.com>2018-08-01 23:32:56 +0200
committerWinnie Hellmann <winnie@gitlab.com>2018-08-02 09:43:51 +0200
commit8ce4e6ecb2c06362977d749dd28bb7f327dc364d (patch)
tree2b09ec48b2f442d592bfb1f6875383aab1b5072e
parent0cfdb5be2e86e0f30669bed332c6d53be7baee13 (diff)
downloadgitlab-ce-8ce4e6ecb2c06362977d749dd28bb7f327dc364d.tar.gz
Fix loading GPG status on blob page
-rw-r--r--app/views/projects/blob/show.html.haml3
-rw-r--r--changelogs/unreleased/winh-fix-blob-gpg-badge.yml5
2 files changed, 7 insertions, 1 deletions
diff --git a/app/views/projects/blob/show.html.haml b/app/views/projects/blob/show.html.haml
index 5edab38bd64..1c487a4eee3 100644
--- a/app/views/projects/blob/show.html.haml
+++ b/app/views/projects/blob/show.html.haml
@@ -3,7 +3,8 @@
- page_title @blob.path, @ref
-.js-signature-container{ data: { 'signatures-path': namespace_project_signatures_path } }
+- signatures_path = namespace_project_signatures_path(namespace_id: @project.namespace.path, project_id: @project.path, id: @ref)
+.js-signature-container{ data: { 'signatures-path': signatures_path } }
%div{ class: container_class }
= render 'projects/last_push'
diff --git a/changelogs/unreleased/winh-fix-blob-gpg-badge.yml b/changelogs/unreleased/winh-fix-blob-gpg-badge.yml
new file mode 100644
index 00000000000..652219c2e2a
--- /dev/null
+++ b/changelogs/unreleased/winh-fix-blob-gpg-badge.yml
@@ -0,0 +1,5 @@
+---
+title: Fix loading GPG status for merge requests on blob page
+merge_request: 20957
+author:
+type: fixed