summaryrefslogtreecommitdiff
path: root/app/controllers/admin
diff options
context:
space:
mode:
authorAndré Luís <me@andr3.net>2018-04-02 14:27:12 +0000
committerDouwe Maan <douwe@gitlab.com>2018-04-02 14:27:12 +0000
commitf8049f4e266417e19a814121923a1e4260a3217d (patch)
tree66114ddbc7ff0aff89e2134e5b2ead4e44e1f595 /app/controllers/admin
parent712da68badb68ddcc7361091c01f32a56fe1186e (diff)
downloadgitlab-ce-f8049f4e266417e19a814121923a1e4260a3217d.tar.gz
Backport changes in EE MR 4972: System Header and Footer
Diffstat (limited to 'app/controllers/admin')
-rw-r--r--app/controllers/admin/appearances_controller.rb18
1 files changed, 14 insertions, 4 deletions
diff --git a/app/controllers/admin/appearances_controller.rb b/app/controllers/admin/appearances_controller.rb
index dd0b38970bd..ea302f17d16 100644
--- a/app/controllers/admin/appearances_controller.rb
+++ b/app/controllers/admin/appearances_controller.rb
@@ -50,9 +50,19 @@ class Admin::AppearancesController < Admin::ApplicationController
# Only allow a trusted parameter "white list" through.
def appearance_params
- params.require(:appearance).permit(
- :title, :description, :logo, :logo_cache, :header_logo, :header_logo_cache,
- :new_project_guidelines, :updated_by
- )
+ params.require(:appearance).permit(allowed_appearance_params)
+ end
+
+ def allowed_appearance_params
+ %i[
+ title
+ description
+ logo
+ logo_cache
+ header_logo
+ header_logo_cache
+ new_project_guidelines
+ updated_by
+ ]
end
end