Merge branch 'ee-30636-fix-blame-edit-blob-without-repo-permissions' into 'master'

Fix edit button on blame page without repo perms -- EE merge edition

Closes gitlab-ce#30636

See merge request !1621

app/views/projects/blob/_blob.html.haml

@@ -26,13 +26,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

app/views/projects/blob/_header.html.haml

@@ -40,6 +40,13 @@
       - 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
 
 - if license_allows_file_locks?
   :javascript