Add latest changes from gitlab-org/gitlab@13-4-stable-ee

1 files changed, 60 insertions, 61 deletions

diff --git a/app/views/projects/empty.html.haml b/app/views/projects/empty.html.haml
index bfb22aa8025..c9edc3c12ec 100644
--- a/app/views/projects/empty.html.haml
+++ b/app/views/projects/empty.html.haml
@@ -5,72 +5,71 @@
 
 = render partial: 'flash_messages', locals: { project: @project }
 
-%div{ class: [("limit-container-width" unless fluid_layout)] }
-  = render "home_panel"
+= render "home_panel"
 
-  %h4.gl-mt-0.gl-mb-3
-    = _('The repository for this project is empty')
+%h4.gl-mt-0.gl-mb-3
+  = _('The repository for this project is empty')
 
-  - if @project.can_current_user_push_code?
-    %p.gl-mb-0
-      = _('You can get started by cloning the repository or start adding files to it with one of the following options.')
+- if @project.can_current_user_push_code?
+  %p.gl-mb-0
+    = _('You can get started by cloning the repository or start adding files to it with one of the following options.')
 
-  .project-buttons.qa-quick-actions
-    .project-clone-holder.d-block.d-md-none.mt-2.mr-2
-      = render "shared/mobile_clone_panel"
+.project-buttons.qa-quick-actions
+  .project-clone-holder.d-block.d-md-none.mt-2.mr-2
+    = render "shared/mobile_clone_panel"
 
-    .project-clone-holder.d-none.d-md-inline-block.mt-2.mr-2.float-left
-      = render "projects/buttons/clone"
-    = render 'stat_anchor_list', anchors: @project.empty_repo_statistics_buttons
+  .project-clone-holder.d-none.d-md-inline-block.mt-2.mr-2.float-left
+    = render "projects/buttons/clone"
+  = render 'stat_anchor_list', anchors: @project.empty_repo_statistics_buttons
 
-  - if can?(current_user, :push_code, @project)
-    .empty-wrapper.gl-mt-7
-      %h3#repo-command-line-instructions.page-title-empty
-        = _('Command line instructions')
-      %p
-        = _('You can also upload existing files from your computer using the instructions below.')
-      .git-empty.js-git-empty
-        %fieldset
-          %h5= _('Git global setup')
-          %pre.bg-light
-            :preserve
-              git config --global user.name "#{h git_user_name}"
-              git config --global user.email "#{h git_user_email}"
+- if can?(current_user, :push_code, @project)
+  .empty-wrapper.gl-mt-7
+    %h3#repo-command-line-instructions.page-title-empty
+      = _('Command line instructions')
+    %p
+      = _('You can also upload existing files from your computer using the instructions below.')
+    .git-empty.js-git-empty
+      %fieldset
+        %h5= _('Git global setup')
+        %pre.bg-light
+          :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.bg-light
-            :preserve
-              git clone #{ content_tag(:span, default_url_to_repo, class: 'js-clone')}
-              cd #{h @project.path}
-              touch README.md
-              git add README.md
-              git commit -m "add README"
-            - if @project.can_current_user_push_to_default_branch?
-              %span><
-                git push -u origin #{ default_branch_name }
+      %fieldset
+        %h5= _('Create a new repository')
+        %pre.bg-light
+          :preserve
+            git clone #{ content_tag(:span, default_url_to_repo, class: 'js-clone')}
+            cd #{h @project.path}
+            touch README.md
+            git add README.md
+            git commit -m "add README"
+          - if @project.can_current_user_push_to_default_branch?
+            %span><
+              git push -u origin #{ default_branch_name }
 
-        %fieldset
-          %h5= _('Push an existing folder')
-          %pre.bg-light
-            :preserve
-              cd existing_folder
-              git init
-              git remote add origin #{ content_tag(:span, default_url_to_repo, class: 'js-clone')}
-              git add .
-              git commit -m "Initial commit"
-            - if @project.can_current_user_push_to_default_branch?
-              %span><
-                git push -u origin #{ default_branch_name }
+      %fieldset
+        %h5= _('Push an existing folder')
+        %pre.bg-light
+          :preserve
+            cd existing_folder
+            git init
+            git remote add origin #{ content_tag(:span, default_url_to_repo, class: 'js-clone')}
+            git add .
+            git commit -m "Initial commit"
+          - if @project.can_current_user_push_to_default_branch?
+            %span><
+              git push -u origin #{ default_branch_name }
 
-        %fieldset
-          %h5= _('Push an existing Git repository')
-          %pre.bg-light
-            :preserve
-              cd existing_repo
-              git remote rename origin old-origin
-              git remote add origin #{ content_tag(:span, default_url_to_repo, class: 'js-clone')}
-            - if @project.can_current_user_push_to_default_branch?
-              %span><
-                git push -u origin --all
-                git push -u origin --tags
+      %fieldset
+        %h5= _('Push an existing Git repository')
+        %pre.bg-light
+          :preserve
+            cd existing_repo
+            git remote rename origin old-origin
+            git remote add origin #{ content_tag(:span, default_url_to_repo, class: 'js-clone')}
+          - if @project.can_current_user_push_to_default_branch?
+            %span><
+              git push -u origin --all
+              git push -u origin --tags