diff options
author | Kamil Trzciński (OoO till 3th) <ayufan@ayufan.eu> | 2018-07-04 12:50:29 +0300 |
---|---|---|
committer | Kamil Trzciński (OoO till 3th) <ayufan@ayufan.eu> | 2018-07-04 12:50:29 +0300 |
commit | 34694c3afc8e3476f5f070fe1c97aef9119a921b (patch) | |
tree | 9a1c90f0bfc37d97aa5675cbfc1748cc0fce0f7d /config | |
parent | cda22d0780ea9bf598f82f51fffb7c50a4b4b1bc (diff) | |
parent | 249c24891a3a54d2fd6b9355244cad4e35d722f7 (diff) |
Merge branch 'jprovazn-direct-upload' into 'master'
Add workhorse authorize method for project/group uploads
Closes #44663
See merge request gitlab-org/gitlab-ce!19717
Diffstat (limited to 'config')
-rw-r--r-- | config/routes/group.rb | 1 | ||||
-rw-r--r-- | config/routes/project.rb | 1 |
2 files changed, 2 insertions, 0 deletions
diff --git a/config/routes/group.rb b/config/routes/group.rb index b09eb3c1b5b..25fbb38ba87 100644 --- a/config/routes/group.rb +++ b/config/routes/group.rb @@ -55,6 +55,7 @@ constraints(::Constraints::GroupUrlConstrainer.new) do resources :uploads, only: [:create] do collection do get ":secret/:filename", action: :show, as: :show, constraints: { filename: %r{[^/]+} } + post :authorize end end diff --git a/config/routes/project.rb b/config/routes/project.rb index 6dfbd7ecd1f..b689b9800e6 100644 --- a/config/routes/project.rb +++ b/config/routes/project.rb @@ -406,6 +406,7 @@ constraints(::Constraints::ProjectUrlConstrainer.new) do resources :uploads, only: [:create] do collection do get ":secret/:filename", action: :show, as: :show, constraints: { filename: %r{[^/]+} } + post :authorize end end |