diff options
| author | Douwe Maan <douwe@gitlab.com> | 2018-12-27 13:25:54 +0300 |
|---|---|---|
| committer | Douwe Maan <douwe@gitlab.com> | 2018-12-27 13:25:54 +0300 |
| commit | d0848c085892f2e9504fcdc524c92b9e0156f2ce (patch) | |
| tree | f83d25b90665047e3167051f93d55048811f2d50 /config | |
| parent | 5fabc1fd3b261d098bc8eb80b2750e14a2c979ea (diff) | |
| parent | 1a24800643c64da3b67790a813edfc4e697224d3 (diff) | |
Merge branch 'sh-use-system-path-for-appearance-logos' into 'master'
Use system paths for appearance logos
Closes gitlab-ee#6778
See merge request gitlab-org/gitlab-ce!24024
Diffstat (limited to 'config')
| -rw-r--r-- | config/routes/uploads.rb | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/config/routes/uploads.rb b/config/routes/uploads.rb index 6becadd57ae..b594f55f8a0 100644 --- a/config/routes/uploads.rb +++ b/config/routes/uploads.rb @@ -17,7 +17,8 @@ scope path: :uploads do # Appearance get "-/system/:model/:mounted_as/:id/:filename", to: "uploads#show", - constraints: { model: /appearance/, mounted_as: /logo|header_logo|favicon/, filename: /.+/ } + constraints: { model: /appearance/, mounted_as: /logo|header_logo|favicon/, filename: /.+/ }, + as: 'appearance_upload' # Project markdown uploads get ":namespace_id/:project_id/:secret/:filename", |