Merge branch '23705-add-single-file-download-in-repo' into 'master'

Resolve "Ability to download single file"

Closes #23705

See merge request gitlab-org/gitlab-ce!20480

6 files changed, 26 insertions, 21 deletions

diff --git a/app/controllers/projects/raw_controller.rb b/app/controllers/projects/raw_controller.rb
index 9bc774b7636..1cba0011304 100644
--- a/app/controllers/projects/raw_controller.rb
+++ b/app/controllers/projects/raw_controller.rb
@@ -10,7 +10,6 @@ class Projects::RawController < Projects::ApplicationController
 
   def show
     @blob = @repository.blob_at(@commit.id, @path)
-
     if @blob
       headers['X-Content-Type-Options'] = 'nosniff'
 
@@ -19,7 +18,7 @@ class Projects::RawController < Projects::ApplicationController
       if @blob.stored_externally?
         send_lfs_object
       else
-        send_git_blob @repository, @blob
+        send_git_blob @repository, @blob, inline: (params[:inline] != 'false')
       end
     else
       render_404
diff --git a/app/helpers/blob_helper.rb b/app/helpers/blob_helper.rb
index 3db28fd6da3..7eb45ddd117 100644
--- a/app/helpers/blob_helper.rb
+++ b/app/helpers/blob_helper.rb
@@ -114,22 +114,22 @@ module BlobHelper
     icon("#{file_type_icon_class('file', mode, name)} fw")
   end
 
-  def blob_raw_url(only_path: false)
+  def blob_raw_url(**kwargs)
     if @build && @entry
-      raw_project_job_artifacts_url(@project, @build, path: @entry.path, only_path: only_path)
+      raw_project_job_artifacts_url(@project, @build, path: @entry.path, **kwargs)
     elsif @snippet
       if @snippet.project_id
-        raw_project_snippet_url(@project, @snippet, only_path: only_path)
+        raw_project_snippet_url(@project, @snippet, **kwargs)
       else
-        raw_snippet_url(@snippet, only_path: only_path)
+        raw_snippet_url(@snippet, **kwargs)
       end
     elsif @blob
-      project_raw_url(@project, @id, only_path: only_path)
+      project_raw_url(@project, @id, **kwargs)
     end
   end
 
-  def blob_raw_path
-    blob_raw_url(only_path: true)
+  def blob_raw_path(**kwargs)
+    blob_raw_url(**kwargs, only_path: true)
   end
 
   # SVGs can contain malicious JavaScript; only include whitelisted
@@ -226,16 +226,17 @@ module BlobHelper
 
   def open_raw_blob_button(blob)
     return if blob.empty?
+    return if blob.raw_binary? || blob.stored_externally?
 
-    if blob.raw_binary? || blob.stored_externally?
-      icon = sprite_icon('download')
-      title = 'Download'
-    else
-      icon = icon('file-code-o')
-      title = 'Open raw'
-    end
+    title = 'Open raw'
+    link_to icon('file-code-o'), blob_raw_path, class: 'btn btn-sm has-tooltip', target: '_blank', rel: 'noopener noreferrer', title: title, data: { container: 'body' }
+  end
+
+  def download_blob_button(blob)
+    return if blob.empty?
 
-    link_to icon, blob_raw_path, class: 'btn btn-sm has-tooltip', target: '_blank', rel: 'noopener noreferrer', title: title, data: { container: 'body' }
+    title = 'Download'
+    link_to sprite_icon('download'), blob_raw_path(inline: false), download: @path, class: 'btn btn-sm has-tooltip', target: '_blank', rel: 'noopener noreferrer', title: title, data: { container: 'body' }
   end
 
   def blob_render_error_reason(viewer)
diff --git a/app/helpers/workhorse_helper.rb b/app/helpers/workhorse_helper.rb
index a82271ce0ee..fd1d78bd9b8 100644
--- a/app/helpers/workhorse_helper.rb
+++ b/app/helpers/workhorse_helper.rb
@@ -2,9 +2,9 @@
 # Workhorse will also serve files when using `send_file`.
 module WorkhorseHelper
   # Send a Git blob through Workhorse
-  def send_git_blob(repository, blob)
+  def send_git_blob(repository, blob, inline: true)
     headers.store(*Gitlab::Workhorse.send_git_blob(repository, blob))
-    headers['Content-Disposition'] = 'inline'
+    headers['Content-Disposition'] = inline ? 'inline' : 'attachment'
     headers['Content-Type'] = safe_content_type(blob)
     render plain: ""
   end
diff --git a/app/views/projects/artifacts/file.html.haml b/app/views/projects/artifacts/file.html.haml
index aac7a1870df..f7174d6b2c6 100644
--- a/app/views/projects/artifacts/file.html.haml
+++ b/app/views/projects/artifacts/file.html.haml
@@ -27,6 +27,6 @@
 
         .btn-group{ role: "group" }<
           = copy_blob_source_button(blob)
-          = open_raw_blob_button(blob)
+          = download_blob_button(blob)
 
     = render 'projects/blob/content', blob: blob
diff --git a/app/views/projects/blob/_header.html.haml b/app/views/projects/blob/_header.html.haml
index 0a0b3ce1d6f..84ccd816d80 100644
--- a/app/views/projects/blob/_header.html.haml
+++ b/app/views/projects/blob/_header.html.haml
@@ -8,8 +8,8 @@
     .btn-group{ role: "group" }<
       = copy_blob_source_button(blob) unless blame
       = open_raw_blob_button(blob)
+      = download_blob_button(blob)
       = view_on_environment_button(@commit.sha, @path, @environment) if @environment
-
     .btn-group{ role: "group" }<
       = render_if_exists 'projects/blob/header_file_locks_link'
       = edit_blob_button
diff --git a/changelogs/unreleased/23705-add-single-file-download-in-repo.yml b/changelogs/unreleased/23705-add-single-file-download-in-repo.yml
new file mode 100644
index 00000000000..f156bfb1101
--- /dev/null
+++ b/changelogs/unreleased/23705-add-single-file-download-in-repo.yml
@@ -0,0 +1,5 @@
+---
+title: Add download button for single file (including raw files) in repository
+merge_request: 20480
+author: Kia Mei Somabes
+type: added