From b4f0ecde79b3263e8875d75cdcf94d011d0d81fe Mon Sep 17 00:00:00 2001 From: Eric Eastwood Date: Mon, 10 Apr 2017 13:30:46 -0500 Subject: Fix edit button on blame page without repo perms Without repo permissions, pressing the "Edit" button on the blame page will now prompt to Fork/Cancel. Fix https://gitlab.com/gitlab-org/gitlab-ce/issues/30636 --- app/views/projects/blob/_blob.html.haml | 7 ------- app/views/projects/blob/_header.html.haml | 7 +++++++ 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/app/views/projects/blob/_blob.html.haml b/app/views/projects/blob/_blob.html.haml index fd0ae42571e..9aafff343f0 100644 --- a/app/views/projects/blob/_blob.html.haml +++ b/app/views/projects/blob/_blob.html.haml @@ -25,13 +25,6 @@ #blob-content-holder.blob-content-holder %article.file-holder = render "projects/blob/header", blob: blob - - if current_user - .js-file-fork-suggestion-section.file-fork-suggestion.hidden - %span.file-fork-suggestion-note - You don't have permission to edit this file. Try forking this project to edit the file. - = link_to 'Fork', fork_path, method: :post, class: 'btn btn-grouped btn-inverted btn-new' - %button.js-cancel-fork-suggestion.btn.btn-grouped{ type: 'button' } - Cancel - if blob.empty? .file-content.code diff --git a/app/views/projects/blob/_header.html.haml b/app/views/projects/blob/_header.html.haml index c42bf3c324a..7a4a293548c 100644 --- a/app/views/projects/blob/_header.html.haml +++ b/app/views/projects/blob/_header.html.haml @@ -38,3 +38,10 @@ - if current_user = replace_blob_link = delete_blob_link +- if current_user + .js-file-fork-suggestion-section.file-fork-suggestion.hidden + %span.file-fork-suggestion-note + You don't have permission to edit this file. Try forking this project to edit the file. + = link_to 'Fork', fork_path, method: :post, class: 'btn btn-grouped btn-inverted btn-new' + %button.js-cancel-fork-suggestion.btn.btn-grouped{ type: 'button' } + Cancel -- cgit v1.2.1