diff options
| author | Douwe Maan <douwe@gitlab.com> | 2018-04-09 10:49:51 +0300 |
|---|---|---|
| committer | Douwe Maan <douwe@gitlab.com> | 2018-04-09 10:49:51 +0300 |
| commit | e9947951a596c3c0d290bee1f7faa30fb824c5e3 (patch) | |
| tree | c0e9373fdbbc5cf931003b4947556ec13dbd22f7 /app/controllers | |
| parent | 86ca1a77c58b508fc1b037c5fffbfb22fd992b42 (diff) | |
| parent | 5c735af3b507d4d1514d1fd66318679a4a2e648e (diff) | |
Merge branch 'sh-handle-legacy-archive-requests' into 'master'
Handle legacy repository archive requests with no ref given
Closes #45154
See merge request gitlab-org/gitlab-ce!18246
Diffstat (limited to 'app/controllers')
| -rw-r--r-- | app/controllers/projects/repositories_controller.rb | 9 |
1 files changed, 7 insertions, 2 deletions
diff --git a/app/controllers/projects/repositories_controller.rb b/app/controllers/projects/repositories_controller.rb index a6167e9dc6c..937b0e39cbd 100644 --- a/app/controllers/projects/repositories_controller.rb +++ b/app/controllers/projects/repositories_controller.rb @@ -16,8 +16,10 @@ class Projects::RepositoriesController < Projects::ApplicationController def archive append_sha = params[:append_sha] - shortname = "#{@project.path}-#{@ref.tr('/', '-')}" - append_sha = false if @filename == shortname + if @ref + shortname = "#{@project.path}-#{@ref.tr('/', '-')}" + append_sha = false if @filename == shortname + end send_git_archive @repository, ref: @ref, format: params[:format], append_sha: append_sha rescue => ex @@ -27,6 +29,9 @@ class Projects::RepositoriesController < Projects::ApplicationController def assign_archive_vars @id = params[:id] + + return unless @id + @ref, @filename = extract_ref(@id) rescue InvalidPathError render_404 |