summaryrefslogtreecommitdiff
path: root/config
diff options
context:
space:
mode:
authorGitLab Release Tools Bot <robert+release-tools@gitlab.com>2019-08-29 21:34:22 +0000
committerGitLab Release Tools Bot <robert+release-tools@gitlab.com>2019-08-29 21:34:22 +0000
commit34c2b6adf9966ac7ad9a9e699211a6074af13fbc (patch)
tree1325c567fbaec574402f55e653dec252c7eddcd1 /config
parent170cb8bc1828b80019fa45e48bc37161973e7a0e (diff)
parent41d52bbfe9725a93013ea6b072efcdc16e591b14 (diff)
downloadgitlab-ce-34c2b6adf9966ac7ad9a9e699211a6074af13fbc.tar.gz
Merge branch 'security-personal-snippets' into 'master'
Add direct upload support for personal snippets See merge request gitlab/gitlabhq!3226
Diffstat (limited to 'config')
-rw-r--r--config/routes/uploads.rb4
1 files changed, 4 insertions, 0 deletions
diff --git a/config/routes/uploads.rb b/config/routes/uploads.rb
index 920f8454ce2..096ef146e07 100644
--- a/config/routes/uploads.rb
+++ b/config/routes/uploads.rb
@@ -30,6 +30,10 @@ scope path: :uploads do
to: 'uploads#create',
constraints: { model: /personal_snippet|user/, id: /\d+/ },
as: 'upload'
+
+ post ':model/authorize',
+ to: 'uploads#authorize',
+ constraints: { model: /personal_snippet|user/ }
end
# Redirect old note attachments path to new uploads path.