Welcome to mirror list, hosted at ThFree Co, Russian Federation.

gitlab.com/gitlab-org/gitlab-foss.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAlexis Reigel <mail@koffeinfrei.org>2017-09-26 10:54:32 +0300
committerAlexis Reigel <mail@koffeinfrei.org>2018-06-05 17:20:18 +0300
commitce6172e863f982c73fedc9f4a73877543c30cb1c (patch)
treec35bc83d94504d1aa55086d62ff2234d12fe62d4 /config/routes
parentc8a4d202c99c772822a2b9b09fa6da2c90b2ae81 (diff)
allow uploading favicon in appearance settings
Diffstat (limited to 'config/routes')
-rw-r--r--config/routes/admin.rb1
-rw-r--r--config/routes/uploads.rb2
2 files changed, 2 insertions, 1 deletions
diff --git a/config/routes/admin.rb b/config/routes/admin.rb
index 3cca1210e39..ff27ceb50dc 100644
--- a/config/routes/admin.rb
+++ b/config/routes/admin.rb
@@ -102,6 +102,7 @@ namespace :admin do
get :preview_sign_in
delete :logo
delete :header_logos
+ delete :favicon
end
end
diff --git a/config/routes/uploads.rb b/config/routes/uploads.rb
index 6370645bcb9..6becadd57ae 100644
--- a/config/routes/uploads.rb
+++ b/config/routes/uploads.rb
@@ -17,7 +17,7 @@ scope path: :uploads do
# Appearance
get "-/system/:model/:mounted_as/:id/:filename",
to: "uploads#show",
- constraints: { model: /appearance/, mounted_as: /logo|header_logo/, filename: /.+/ }
+ constraints: { model: /appearance/, mounted_as: /logo|header_logo|favicon/, filename: /.+/ }
# Project markdown uploads
get ":namespace_id/:project_id/:secret/:filename",