summaryrefslogtreecommitdiff
path: root/config
diff options
context:
space:
mode:
authorZeger-Jan van de Weg <zegerjan@gitlab.com>2016-02-22 20:49:16 +0100
committerZeger-Jan van de Weg <zegerjan@gitlab.com>2016-02-26 15:50:51 +0100
commit9a2869ab4674b8a6b94ec206660e083a00d4db37 (patch)
tree312031a3cf31c736e1e4f0d7090c7e1613e1a74c /config
parentbb3563b5cd063772fa16c934404e7912d9f3d726 (diff)
downloadgitlab-ce-9a2869ab4674b8a6b94ec206660e083a00d4db37.tar.gz
Branded login page also in CE11489-branded-appearance-to-ce
The only major difference with the EE version is the change from a light and dark logo to only a header logo The dark logo wasn't used anyway, so it seemed to make sense to me to rename the field to the actual function of it
Diffstat (limited to 'config')
-rw-r--r--config/routes.rb13
1 files changed, 13 insertions, 0 deletions
diff --git a/config/routes.rb b/config/routes.rb
index 1485b64da19..a2acf170a6b 100644
--- a/config/routes.rb
+++ b/config/routes.rb
@@ -156,6 +156,11 @@ Rails.application.routes.draw do
to: "uploads#show",
constraints: { model: /note|user|group|project/, mounted_as: /avatar|attachment/, filename: /[^\/]+/ }
+ # Appearance
+ get ":model/:mounted_as/:id/:filename",
+ to: "uploads#show",
+ constraints: { model: /appearance/, mounted_as: /logo|header_logo/, filename: /.+/ }
+
# Project markdown uploads
get ":namespace_id/:project_id/:secret/:filename",
to: "projects/uploads#show",
@@ -253,6 +258,14 @@ Rails.application.routes.draw do
end
end
+ resource :appearances, path: 'appearance' do
+ member do
+ get :preview
+ delete :logo
+ delete :header_logos
+ end
+ end
+
resource :application_settings, only: [:show, :update] do
resources :services
put :reset_runners_token