diff options
| author | Rémy Coutable <remy@rymai.me> | 2018-08-07 14:02:53 +0000 |
|---|---|---|
| committer | Rémy Coutable <remy@rymai.me> | 2018-08-07 14:02:53 +0000 |
| commit | 4e1b6d1eda7a9861c4e9a7418a32a424cb2fdd4f (patch) | |
| tree | cfaa02c09a407376ac1e9fb0904e93faa3c1c370 /app | |
| parent | 84f24dcef0d44e7447d3f3de4ec91668e5d9d3a3 (diff) | |
| parent | fed97a68b941659949e7b8b40977d54850bfbf8f (diff) | |
| download | gitlab-ce-4e1b6d1eda7a9861c4e9a7418a32a424cb2fdd4f.tar.gz | |
Merge branch 'winh-fix-gpg-regressions' into 'master'
Fix GPG status badge loading regressions
Closes #49878, #49870, gitlab-org/quality/nightly#6 et #49831
See merge request gitlab-org/gitlab-ce!20987
Diffstat (limited to 'app')
| -rw-r--r-- | app/views/projects/blob/show.html.haml | 3 | ||||
| -rw-r--r-- | app/views/projects/show.html.haml | 2 | ||||
| -rw-r--r-- | app/views/projects/tree/show.html.haml | 2 |
3 files changed, 4 insertions, 3 deletions
diff --git a/app/views/projects/blob/show.html.haml b/app/views/projects/blob/show.html.haml index 5edab38bd64..a0b0384d78d 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.full_path, project_id: @project.path, id: @last_commit) +.js-signature-container{ data: { 'signatures-path': signatures_path } } %div{ class: container_class } = render 'projects/last_push' diff --git a/app/views/projects/show.html.haml b/app/views/projects/show.html.haml index e011851be78..8a5abb64515 100644 --- a/app/views/projects/show.html.haml +++ b/app/views/projects/show.html.haml @@ -9,7 +9,7 @@ = render partial: 'flash_messages', locals: { project: @project } - if @project.repository_exists? && !@project.empty_repo? - - signatures_path = namespace_project_signatures_path(project_id: @project.path, id: @project.default_branch) + - signatures_path = namespace_project_signatures_path(namespace_id: @project.namespace.full_path, project_id: @project.path, id: @project.default_branch) .js-signature-container{ data: { 'signatures-path': signatures_path } } %div{ class: [container_class, ("limit-container-width" unless fluid_layout)] } diff --git a/app/views/projects/tree/show.html.haml b/app/views/projects/tree/show.html.haml index ace8120eeff..9d2aee7a8bd 100644 --- a/app/views/projects/tree/show.html.haml +++ b/app/views/projects/tree/show.html.haml @@ -1,7 +1,7 @@ - @no_container = true - breadcrumb_title _("Repository") - @content_class = "limit-container-width" unless fluid_layout -- signatures_path = namespace_project_signatures_path(namespace_id: @project.namespace.path, project_id: @project.path, id: @ref) +- signatures_path = namespace_project_signatures_path(namespace_id: @project.namespace.full_path, project_id: @project.path, id: @last_commit) - page_title @path.presence || _("Files"), @ref = content_for :meta_tags do |