diff options
| author | Douwe Maan <douwe@gitlab.com> | 2018-10-16 22:20:19 +0300 |
|---|---|---|
| committer | Douwe Maan <douwe@gitlab.com> | 2018-10-16 22:20:19 +0300 |
| commit | 69c7d48e0df4005b7dab9609384d372056f85cf3 (patch) | |
| tree | d9139122d022a3a580e6cbeacd20a19221e72ac7 /app | |
| parent | 4f475b812512dfa0029c7995d1fc3057e6b0c648 (diff) | |
| parent | c6ac04e4da60707a7bf13c796f95844e5409f451 (diff) | |
Merge branch 'sh-fix-commit-signatures-error' into 'master'
Fix commit signature error when project is disabled
Closes #50903
See merge request gitlab-org/gitlab-ce!22344
Diffstat (limited to 'app')
| -rw-r--r-- | app/views/projects/show.html.haml | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/app/views/projects/show.html.haml b/app/views/projects/show.html.haml index aba289c790f..283031b06da 100644 --- a/app/views/projects/show.html.haml +++ b/app/views/projects/show.html.haml @@ -8,8 +8,8 @@ = render partial: 'flash_messages', locals: { project: @project } -- if @project.repository_exists? && !@project.empty_repo? - - signatures_path = namespace_project_signatures_path(namespace_id: @project.namespace.full_path, project_id: @project.path, id: @project.default_branch) +- if !@project.empty_repo? && can?(current_user, :download_code, @project) + - signatures_path = project_signatures_path(@project, @project.default_branch) .js-signature-container{ data: { 'signatures-path': signatures_path } } %div{ class: [container_class, ("limit-container-width" unless fluid_layout)] } |