diff options
| author | Marin Jankovski <marin@gitlab.com> | 2019-07-02 06:29:42 +0000 |
|---|---|---|
| committer | Marin Jankovski <marin@gitlab.com> | 2019-07-02 06:29:42 +0000 |
| commit | bebbb43f7133cc03c3a9944d2a4b9586a6a0d06f (patch) | |
| tree | 26b96831830504d51a94240d2bb3de916f41b0ea /config | |
| parent | 91820f967db8aef75d247a61f4843fb0cdf23d89 (diff) | |
| parent | 114dd976426a26c19d5e2a350a2c41bda35ddf54 (diff) | |
| download | gitlab-ce-bebbb43f7133cc03c3a9944d2a4b9586a6a0d06f.tar.gz | |
Merge branch 'osw-persist-tmp-snippet-uploads' into 'master'
Persist tmp snippet uploads at users
See merge request gitlab/gitlabhq!3138
Diffstat (limited to 'config')
| -rw-r--r-- | config/routes/uploads.rb | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/config/routes/uploads.rb b/config/routes/uploads.rb index b594f55f8a0..920f8454ce2 100644 --- a/config/routes/uploads.rb +++ b/config/routes/uploads.rb @@ -7,7 +7,7 @@ scope path: :uploads do # show uploads for models, snippets (notes) available for now get '-/system/:model/:id/:secret/:filename', to: 'uploads#show', - constraints: { model: /personal_snippet/, id: /\d+/, filename: %r{[^/]+} } + constraints: { model: /personal_snippet|user/, id: /\d+/, filename: %r{[^/]+} } # show temporary uploads get '-/system/temp/:secret/:filename', @@ -28,7 +28,7 @@ scope path: :uploads do # create uploads for models, snippets (notes) available for now post ':model', to: 'uploads#create', - constraints: { model: /personal_snippet/, id: /\d+/ }, + constraints: { model: /personal_snippet|user/, id: /\d+/ }, as: 'upload' end |