Merge branch 'fix-issue-3094' into 'master'

Don't show "Add README" link in an empty repository if user doesn't have access to push

Reporter users would see this before even though they didn't have access to push:

![image](/uploads/1dd328ab7e58cd00c5b696f079816e16/image.png)

It's not complete accurate to include the push command-line instructions, but users may still want the instructions to clone. After:

![image](/uploads/3d214e140916d2f174d0b5fec0ac472d/image.png)

Closes #3094

See merge request !1626

2 files changed, 45 insertions, 41 deletions

diff --git a/CHANGELOG b/CHANGELOG
index 3733a946f41..0cc4b8e90fe 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -16,6 +16,7 @@ v 8.1.0 (unreleased)
   - Show notifications button when user is member of group rather than project (Grzegorz Bizon)
   - Fix bug preventing mentioned issued from being closed when MR is merged using fast-forward merge.
   - Fix nonatomic database update potentially causing project star counts to go negative (Stan Hu)
+  - Don't show "Add README" link in an empty repository if user doesn't have access to push (Stan Hu)
   - Fix error preventing displaying of commit data for a directory with a leading dot (Stan Hu)
   - Speed up load times of issue detail pages by roughly 1.5x
   - If a merge request is to close an issue, show this on the issue page (Zeger-Jan van de Weg)
diff --git a/app/views/projects/empty.html.haml b/app/views/projects/empty.html.haml
index e06454fd148..c3858e78cad 100644
--- a/app/views/projects/empty.html.haml
+++ b/app/views/projects/empty.html.haml
@@ -2,53 +2,56 @@
   - if current_user && can?(current_user, :download_code, @project)
     = render 'shared/no_ssh'
     = render 'shared/no_password'
-    
+
 = render "home_panel"
 
 .gray-content-block.center
   %h3.page-title
     The repository for this project is empty
-  %p
-    If you already have files you can push them using command line instructions below.
-    %br
-    Otherwise you can start with
-    = link_to "adding README", new_readme_path, class: 'underlined-link'
-    file to this project.
+  - if can?(current_user, :download_code, @project)
+    %p
+      If you already have files you can push them using command line instructions below.
+      %br
+      - if can?(current_user, :push_code, @project)
+        Otherwise you can start with
+        = link_to "adding README", new_readme_path, class: 'underlined-link'
+        file to this project.
 
-.prepend-top-20
-.empty_wrapper
-  %h3.page-title-empty
-    Command line instructions
-  %div.git-empty
-    %fieldset
-      %h5 Git global setup
-      %pre.light-well
-        :preserve
-          git config --global user.name "#{h git_user_name}"
-          git config --global user.email "#{h git_user_email}"
+- if can?(current_user, :download_code, @project)
+  .prepend-top-20
+  .empty_wrapper
+    %h3.page-title-empty
+      Command line instructions
+    %div.git-empty
+      %fieldset
+        %h5 Git global setup
+        %pre.light-well
+          :preserve
+            git config --global user.name "#{h git_user_name}"
+            git config --global user.email "#{h git_user_email}"
 
-    %fieldset
-      %h5 Create a new repository
-      %pre.light-well
-        :preserve
-          git clone #{ content_tag(:span, default_url_to_repo, class: 'clone')}
-          cd #{h @project.path}
-          touch README.md
-          git add README.md
-          git commit -m "add README"
-          git push -u origin master
+      %fieldset
+        %h5 Create a new repository
+        %pre.light-well
+          :preserve
+            git clone #{ content_tag(:span, default_url_to_repo, class: 'clone')}
+            cd #{h @project.path}
+            touch README.md
+            git add README.md
+            git commit -m "add README"
+            git push -u origin master
 
-    %fieldset
-      %h5 Existing folder or Git repository
-      %pre.light-well
-        :preserve
-          cd existing_folder
-          git init
-          git remote add origin #{ content_tag(:span, default_url_to_repo, class: 'clone')}
-          git add .
-          git commit
-          git push -u origin master
+      %fieldset
+        %h5 Existing folder or Git repository
+        %pre.light-well
+          :preserve
+            cd existing_folder
+            git init
+            git remote add origin #{ content_tag(:span, default_url_to_repo, class: 'clone')}
+            git add .
+            git commit
+            git push -u origin master
 
-      - if can? current_user, :remove_project, @project
-        .prepend-top-20
-          = link_to 'Remove project', [@project.namespace.becomes(Namespace), @project], data: { confirm: remove_project_message(@project)}, method: :delete, class: "btn btn-remove pull-right"
+        - if can? current_user, :remove_project, @project
+          .prepend-top-20
+            = link_to 'Remove project', [@project.namespace.becomes(Namespace), @project], data: { confirm: remove_project_message(@project)}, method: :delete, class: "btn btn-remove pull-right"