Revert "Merge branch '24704-download-repository-path' into 'master'"

This reverts commit 6c75bd015cba181f028bc87c396c3d8e43b5dc3e, reversing
changes made to 1be7f5aaa38aba79843eae8835be6c99c025e982.

2 files changed, 23 insertions, 22 deletions

diff --git a/app/views/projects/buttons/_download.html.haml b/app/views/projects/buttons/_download.html.haml
index acd63de2277..4eb53faa6ff 100644
--- a/app/views/projects/buttons/_download.html.haml
+++ b/app/views/projects/buttons/_download.html.haml
@@ -8,20 +8,30 @@
       %span.sr-only=  _('Select Archive Format')
       = sprite_icon("arrow-down")
     %ul.dropdown-menu.dropdown-menu-right{ role: 'menu' }
-      %li.dropdown-bold-header= _('Download source code')
-      %li.dropdown-menu-content
-        = render 'projects/buttons/download_links', project: project, ref: ref, archive_prefix: archive_prefix, path: nil
-      - if directory?
-        %li.separator
-        %li.dropdown-bold-header= _('Download this directory')
-        %li.dropdown-menu-content
-          = render 'projects/buttons/download_links', project: project, ref: ref, archive_prefix: archive_prefix, path: @path
+      %li.dropdown-header
+        #{ _('Source code') }
+      %li
+        = link_to project_archive_path(project, id: tree_join(ref, archive_prefix), format: 'zip'), rel: 'nofollow', download: '' do
+          %span=  _('Download zip')
+      %li
+        = link_to project_archive_path(project, id: tree_join(ref, archive_prefix), format: 'tar.gz'), rel: 'nofollow', download: '' do
+          %span= _('Download tar.gz')
+      %li
+        = link_to project_archive_path(project, id: tree_join(ref, archive_prefix), format: 'tar.bz2'), rel: 'nofollow', download: '' do
+          %span= _('Download tar.bz2')
+      %li
+        = link_to project_archive_path(project, id: tree_join(ref, archive_prefix), format: 'tar'), rel: 'nofollow', download: '' do
+          %span= _('Download tar')
+
       - if pipeline && pipeline.latest_builds_with_artifacts.any?
-        %li.separator
-        %li.dropdown-bold-header= _('Download artifacts')
+        %li.dropdown-header Artifacts
         - unless pipeline.latest?
-          %span.unclickable= ci_status_for_statuseable(project.pipeline_for(ref))
-        %li.dropdown-header= _('Previous Artifacts')
+          - latest_pipeline = project.pipeline_for(ref)
+          %li
+            .unclickable= ci_status_for_statuseable(latest_pipeline)
+          %li.dropdown-header Previous Artifacts
         - pipeline.latest_builds_with_artifacts.each do |job|
           %li
-            = link_to job.name, latest_succeeded_project_artifacts_path(project, "#{ref}/download", job: job.name), rel: 'nofollow', download: ''
+            = link_to latest_succeeded_project_artifacts_path(project, "#{ref}/download", job: job.name), rel: 'nofollow', download: '' do
+              %span
+                #{s_('DownloadArtifacts|Download')} '#{job.name}'
diff --git a/app/views/projects/buttons/_download_links.html.haml b/app/views/projects/buttons/_download_links.html.haml
deleted file mode 100644
index 47a1704f946..00000000000
--- a/app/views/projects/buttons/_download_links.html.haml
+++ /dev/null
@@ -1,9 +0,0 @@
-%ul
-  %li.d-inline-block.m-0.p-0
-    = link_to 'zip', project_archive_path(project, id: tree_join(ref, archive_prefix), path: path, format: 'zip'), rel: 'nofollow', download: '', class: 'btn btn-primary btn-xs'
-  %li.d-inline-block.m-0.p-0
-    = link_to 'tar.gz', project_archive_path(project, id: tree_join(ref, archive_prefix), path: path, format: 'tar.gz'), rel: 'nofollow', download: '', class: 'btn btn-xs'
-  %li.d-inline-block.m-0.p-0
-    = link_to 'tar.bz2', project_archive_path(project, id: tree_join(ref, archive_prefix), path: path, format: 'tar.bz2'), rel: 'nofollow', download: '', class: 'btn btn-xs'
-  %li.d-inline-block.m-0.p-0
-    = link_to 'tar', project_archive_path(project, id: tree_join(ref, archive_prefix), path: path, format: 'tar'), rel: 'nofollow', download: '', class: 'btn btn-xs'