From 8c3ba8d6c9021f250fb1597f6b597d817af46b38 Mon Sep 17 00:00:00 2001
From: Douwe Maan <douwe@selenight.nl>
Date: Mon, 6 Jun 2016 13:16:30 +0200
Subject: Add workhorse controller and API helpers

---
 lib/api/helpers.rb      | 10 ++++++++++
 lib/api/repositories.rb | 10 +++-------
 lib/gitlab/workhorse.rb |  8 ++++----
 3 files changed, 17 insertions(+), 11 deletions(-)

(limited to 'lib')

diff --git a/lib/api/helpers.rb b/lib/api/helpers.rb
index 2aaa0557ea3..0e47bb0b8ad 100644
--- a/lib/api/helpers.rb
+++ b/lib/api/helpers.rb
@@ -408,5 +408,15 @@ module API
       error!(errors[:access_level], 422) if errors[:access_level].any?
       not_found!(errors)
     end
+
+    def send_git_blob(repository, blob)
+      env['api.format'] = :txt
+      content_type 'text/plain'
+      header *Gitlab::Workhorse.send_git_blob(repository, blob)
+    end
+
+    def send_git_archive(repository, ref:, format:)
+      header *Gitlab::Workhorse.send_git_archive(repository, ref: ref, format: format)
+    end
   end
 end
diff --git a/lib/api/repositories.rb b/lib/api/repositories.rb
index 9cb14e95ebc..f55aceed92c 100644
--- a/lib/api/repositories.rb
+++ b/lib/api/repositories.rb
@@ -56,8 +56,7 @@ module API
         blob = Gitlab::Git::Blob.find(repo, commit.id, params[:filepath])
         not_found! "File" unless blob
 
-        content_type 'text/plain'
-        header(*Gitlab::Workhorse.send_git_blob(repo, blob))
+        send_git_blob repo, blob
       end
 
       # Get a raw blob contents by blob sha
@@ -80,10 +79,7 @@ module API
 
         not_found! 'Blob' unless blob
 
-        env['api.format'] = :txt
-
-        content_type blob.mime_type
-        header(*Gitlab::Workhorse.send_git_blob(repo, blob))
+        send_git_blob repo, blob
       end
 
       # Get a an archive of the repository
@@ -98,7 +94,7 @@ module API
         authorize! :download_code, user_project
 
         begin
-          header(*Gitlab::Workhorse.send_git_archive(user_project, params[:sha], params[:format]))
+          send_git_archive user_project.repository, ref: params[:sha], format: params[:format]
         rescue
           not_found!('File')
         end
diff --git a/lib/gitlab/workhorse.rb b/lib/gitlab/workhorse.rb
index c3ddd4c2680..96e99dc0088 100644
--- a/lib/gitlab/workhorse.rb
+++ b/lib/gitlab/workhorse.rb
@@ -18,10 +18,10 @@ module Gitlab
         ]
       end
 
-      def send_git_archive(project, ref, format)
+      def send_git_archive(repository, ref:, format:)
         format ||= 'tar.gz'
         format.downcase!
-        params = project.repository.archive_metadata(ref, Gitlab.config.gitlab.repository_downloads_path, format)
+        params = repository.archive_metadata(ref, Gitlab.config.gitlab.repository_downloads_path, format)
         raise "Repository or ref not found" if params.empty?
 
         [
@@ -29,9 +29,9 @@ module Gitlab
           "git-archive:#{encode(params)}",
         ]
       end
-      
+
       protected
-      
+
       def encode(hash)
         Base64.urlsafe_encode64(JSON.dump(hash))
       end
-- 
cgit v1.2.1


From 701e2df7e55113dafd48c570baad44bf7f24f863 Mon Sep 17 00:00:00 2001
From: Douwe Maan <douwe@selenight.nl>
Date: Fri, 10 Jun 2016 12:29:15 +0200
Subject: Satisfy Rubocop

---
 lib/api/helpers.rb | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'lib')

diff --git a/lib/api/helpers.rb b/lib/api/helpers.rb
index 0e47bb0b8ad..e1d3bbcc02d 100644
--- a/lib/api/helpers.rb
+++ b/lib/api/helpers.rb
@@ -412,11 +412,11 @@ module API
     def send_git_blob(repository, blob)
       env['api.format'] = :txt
       content_type 'text/plain'
-      header *Gitlab::Workhorse.send_git_blob(repository, blob)
+      header(*Gitlab::Workhorse.send_git_blob(repository, blob))
     end
 
     def send_git_archive(repository, ref:, format:)
-      header *Gitlab::Workhorse.send_git_archive(repository, ref: ref, format: format)
+      header(*Gitlab::Workhorse.send_git_archive(repository, ref: ref, format: format))
     end
   end
 end
-- 
cgit v1.2.1