Revert "Merge branch '24704-download-repository-path' into 'master'"revert-24704-download-repository-path-11-10-rc6

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

6 files changed, 27 insertions, 35 deletions

diff --git a/app/assets/stylesheets/framework/dropdowns.scss b/app/assets/stylesheets/framework/dropdowns.scss
index efcd35a2e0e..b90db135b4a 100644
--- a/app/assets/stylesheets/framework/dropdowns.scss
+++ b/app/assets/stylesheets/framework/dropdowns.scss
@@ -287,7 +287,7 @@
     list-style: none;
     padding: 0 1px;
 
-    a:not(.btn),
+    a,
     button,
     .menu-item {
       @include dropdown-link;
@@ -351,10 +351,6 @@
     // Expects up to 3 digits on the badge
     margin-right: 40px;
   }
-
-  .dropdown-menu-content {
-    padding: $dropdown-item-padding-y $dropdown-item-padding-x;
-  }
 }
 
 .droplab-dropdown {
diff --git a/app/controllers/projects/repositories_controller.rb b/app/controllers/projects/repositories_controller.rb
index 3b4215b766e..4eeaeb860ee 100644
--- a/app/controllers/projects/repositories_controller.rb
+++ b/app/controllers/projects/repositories_controller.rb
@@ -23,7 +23,7 @@ class Projects::RepositoriesController < Projects::ApplicationController
       append_sha = false if @filename == shortname
     end
 
-    send_git_archive @repository, ref: @ref, path: params[:path], format: params[:format], append_sha: append_sha
+    send_git_archive @repository, ref: @ref, format: params[:format], append_sha: append_sha
   rescue => ex
     logger.error("#{self.class.name}: #{ex}")
     git_not_found!
diff --git a/app/helpers/projects_helper.rb b/app/helpers/projects_helper.rb
index 009dd70c2c9..f2abb241753 100644
--- a/app/helpers/projects_helper.rb
+++ b/app/helpers/projects_helper.rb
@@ -299,10 +299,6 @@ module ProjectsHelper
     }.to_json
   end
 
-  def directory?
-    @path.present?
-  end
-
   private
 
   def get_project_nav_tabs(project, current_user)
diff --git a/app/models/repository.rb b/app/models/repository.rb
index 51ab2247a03..574ce12b309 100644
--- a/app/models/repository.rb
+++ b/app/models/repository.rb
@@ -299,14 +299,13 @@ class Repository
     end
   end
 
-  def archive_metadata(ref, storage_path, format = "tar.gz", append_sha:, path: nil)
+  def archive_metadata(ref, storage_path, format = "tar.gz", append_sha:)
     raw_repository.archive_metadata(
       ref,
       storage_path,
       project.path,
       format,
-      append_sha: append_sha,
-      path: path
+      append_sha: append_sha
     )
   end
 
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'