summaryrefslogtreecommitdiff
path: root/app/controllers/uploads_controller.rb
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 /app/controllers/uploads_controller.rb
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 'app/controllers/uploads_controller.rb')
-rw-r--r--app/controllers/uploads_controller.rb5
1 files changed, 3 insertions, 2 deletions
diff --git a/app/controllers/uploads_controller.rb b/app/controllers/uploads_controller.rb
index 868b05929d7..509f4f412ca 100644
--- a/app/controllers/uploads_controller.rb
+++ b/app/controllers/uploads_controller.rb
@@ -55,14 +55,15 @@ class UploadsController < ApplicationController
"user" => User,
"project" => Project,
"note" => Note,
- "group" => Group
+ "group" => Group,
+ "appearance" => Appearance
}
upload_models[params[:model]]
end
def upload_mount
- upload_mounts = %w(avatar attachment file)
+ upload_mounts = %w(avatar attachment file logo header_logo)
if upload_mounts.include?(params[:mounted_as])
params[:mounted_as]