From dafd5531ed793321eb8d886715654b4d572b2880 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?R=C3=A9my=20Coutable?= <remy@rymai.me>
Date: Tue, 10 Jan 2017 14:40:08 +0100
Subject: [PATCH] Refactor authorized params in
 Admin::ApplicationSettingsController
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Signed-off-by: Rémy Coutable <remy@rymai.me>
---
 .../admin/application_settings_controller.rb  | 151 ++++++++++--------
 1 file changed, 88 insertions(+), 63 deletions(-)

diff --git a/app/controllers/admin/application_settings_controller.rb b/app/controllers/admin/application_settings_controller.rb
index c2bb8464824..8dbdeca4abd 100644
--- a/app/controllers/admin/application_settings_controller.rb
+++ b/app/controllers/admin/application_settings_controller.rb
@@ -67,69 +67,94 @@ class Admin::ApplicationSettingsController < Admin::ApplicationController
     params.delete(:domain_blacklist_raw) if params[:domain_blacklist_file]
 
     params.require(:application_setting).permit(
-      :default_projects_limit,
-      :default_branch_protection,
-      :signup_enabled,
-      :signin_enabled,
-      :require_two_factor_authentication,
-      :two_factor_grace_period,
-      :gravatar_enabled,
-      :sign_in_text,
-      :after_sign_up_text,
-      :help_page_text,
-      :home_page_url,
-      :after_sign_out_path,
-      :max_attachment_size,
-      :session_expire_delay,
-      :default_project_visibility,
-      :default_snippet_visibility,
-      :default_group_visibility,
-      :domain_whitelist_raw,
-      :domain_blacklist_enabled,
-      :domain_blacklist_raw,
-      :domain_blacklist_file,
-      :version_check_enabled,
-      :admin_notification_email,
-      :user_oauth_applications,
-      :user_default_external,
-      :shared_runners_enabled,
-      :shared_runners_text,
-      :max_artifacts_size,
-      :metrics_enabled,
-      :metrics_host,
-      :metrics_port,
-      :metrics_pool_size,
-      :metrics_timeout,
-      :metrics_method_call_threshold,
-      :metrics_sample_interval,
-      :recaptcha_enabled,
-      :recaptcha_site_key,
-      :recaptcha_private_key,
-      :sentry_enabled,
-      :sentry_dsn,
-      :akismet_enabled,
-      :akismet_api_key,
-      :koding_enabled,
-      :koding_url,
-      :email_author_in_body,
-      :html_emails_enabled,
-      :repository_checks_enabled,
-      :metrics_packet_size,
-      :send_user_confirmation_email,
-      :container_registry_token_expire_delay,
-      :enabled_git_access_protocol,
-      :sidekiq_throttling_enabled,
-      :sidekiq_throttling_factor,
-      :housekeeping_enabled,
-      :housekeeping_bitmaps_enabled,
-      :housekeeping_incremental_repack_period,
-      :housekeeping_full_repack_period,
-      :housekeeping_gc_period,
-      repository_storages: [],
-      restricted_visibility_levels: [],
-      import_sources: [],
-      disabled_oauth_sign_in_sources: [],
-      sidekiq_throttling_queues: []
+      application_setting_params_ce
     )
   end
+
+  def application_setting_params_ce
+    [
+      :admin_notification_email,
+      :after_sign_out_path,
+      :after_sign_up_text,
+
+      :akismet_api_key,
+      :akismet_enabled,
+
+      :container_registry_token_expire_delay,
+
+      :default_branch_protection,
+      :default_group_visibility,
+      :default_project_visibility,
+      :default_projects_limit,
+      :default_snippet_visibility,
+
+      :domain_blacklist_enabled,
+      :domain_blacklist_file,
+      :domain_blacklist_raw,
+      :domain_whitelist_raw,
+
+      :email_author_in_body,
+      :enabled_git_access_protocol,
+      :gravatar_enabled,
+      :help_page_text,
+      :home_page_url,
+
+      :housekeeping_bitmaps_enabled,
+      :housekeeping_enabled,
+      :housekeeping_full_repack_period,
+      :housekeeping_gc_period,
+      :housekeeping_incremental_repack_period,
+
+      :html_emails_enabled,
+
+      :koding_enabled,
+      :koding_url,
+
+      :max_artifacts_size,
+      :max_attachment_size,
+
+      :metrics_enabled,
+      :metrics_host,
+      :metrics_method_call_threshold,
+      :metrics_packet_size,
+      :metrics_pool_size,
+      :metrics_port,
+      :metrics_sample_interval,
+      :metrics_timeout,
+
+      :recaptcha_enabled,
+      :recaptcha_private_key,
+      :recaptcha_site_key,
+
+      :repository_checks_enabled,
+      :require_two_factor_authentication,
+      :session_expire_delay,
+
+      :sign_in_text,
+      :signin_enabled,
+      :signup_enabled,
+
+      :sentry_dsn,
+      :sentry_enabled,
+
+      :send_user_confirmation_email,
+
+      :shared_runners_enabled,
+      :shared_runners_text,
+
+      :sidekiq_throttling_enabled,
+      :sidekiq_throttling_factor,
+
+      :two_factor_grace_period,
+      :user_default_external,
+      :user_oauth_applications,
+      :version_check_enabled,
+
+      disabled_oauth_sign_in_sources: [],
+      import_sources: [],
+      repository_storages: [],
+      restricted_visibility_levels: [],
+      sidekiq_throttling_queues: []
+    ]
+  end
 end