diff options
author | Douwe Maan <douwe@gitlab.com> | 2018-04-06 14:14:39 +0000 |
---|---|---|
committer | Douwe Maan <douwe@gitlab.com> | 2018-04-06 14:14:39 +0000 |
commit | 44f4a674e2a87d104f700265d835aba000c589f0 (patch) | |
tree | 1766e8c5a220fed40333c42e8db8ee02494da224 /app/controllers | |
parent | fe17613dec7ce0c97ca2c487f27352532968f757 (diff) | |
parent | 07f517d441ab8782286b4a59d56a630393d75e16 (diff) | |
download | gitlab-ce-44f4a674e2a87d104f700265d835aba000c589f0.tar.gz |
Merge branch 'jramsay-38830-tarball' into 'master'
Add alternative archive route
Closes #38830
See merge request gitlab-org/gitlab-ce!17225
Diffstat (limited to 'app/controllers')
-rw-r--r-- | app/controllers/projects/repositories_controller.rb | 17 |
1 files changed, 16 insertions, 1 deletions
diff --git a/app/controllers/projects/repositories_controller.rb b/app/controllers/projects/repositories_controller.rb index d5af0341d18..a6167e9dc6c 100644 --- a/app/controllers/projects/repositories_controller.rb +++ b/app/controllers/projects/repositories_controller.rb @@ -1,6 +1,9 @@ class Projects::RepositoriesController < Projects::ApplicationController + include ExtractsPath + # Authorize before_action :require_non_empty_project, except: :create + before_action :assign_archive_vars, only: :archive before_action :authorize_download_code! before_action :authorize_admin_project!, only: :create @@ -11,9 +14,21 @@ class Projects::RepositoriesController < Projects::ApplicationController end def archive - send_git_archive @repository, ref: params[:ref], format: params[:format] + append_sha = params[:append_sha] + + shortname = "#{@project.path}-#{@ref.tr('/', '-')}" + append_sha = false if @filename == shortname + + send_git_archive @repository, ref: @ref, format: params[:format], append_sha: append_sha rescue => ex logger.error("#{self.class.name}: #{ex}") return git_not_found! end + + def assign_archive_vars + @id = params[:id] + @ref, @filename = extract_ref(@id) + rescue InvalidPathError + render_404 + end end |