diff options
author | Marcia Ramos <virtua.creative@gmail.com> | 2018-04-17 12:38:04 -0300 |
---|---|---|
committer | Marcia Ramos <virtua.creative@gmail.com> | 2018-04-17 12:38:04 -0300 |
commit | a9c32fe099db50a1ec147b84ee31dafb9321c3a4 (patch) | |
tree | 3b0be4dbd5ce89a3adeb51091808b4200688f99a /config/routes/repository.rb | |
parent | d1e0e6815fd5c39683660436aff0581e3ce9f54d (diff) | |
parent | 4355a13ad4e04b1ae82b60858376c426ae041699 (diff) | |
download | gitlab-ce-a9c32fe099db50a1ec147b84ee31dafb9321c3a4.tar.gz |
Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ce into docs-add-badges
Diffstat (limited to 'config/routes/repository.rb')
-rw-r--r-- | config/routes/repository.rb | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/config/routes/repository.rb b/config/routes/repository.rb index eace3a615b4..9e506a1a43a 100644 --- a/config/routes/repository.rb +++ b/config/routes/repository.rb @@ -2,10 +2,11 @@ resource :repository, only: [:create] do member do - get ':ref/archive', constraints: { format: Gitlab::PathRegex.archive_formats_regex, ref: /.+/ }, action: 'archive', as: 'archive' - # deprecated since GitLab 9.5 - get 'archive', constraints: { format: Gitlab::PathRegex.archive_formats_regex }, as: 'archive_alternative' + get 'archive', constraints: { format: Gitlab::PathRegex.archive_formats_regex }, as: 'archive_alternative', defaults: { append_sha: true } + + # deprecated since GitLab 10.7 + get ':id/archive', constraints: { format: Gitlab::PathRegex.archive_formats_regex, id: /.+/ }, action: 'archive', as: 'archive_deprecated', defaults: { append_sha: true } end end |