diff --git a/config/application.rb b/config/application.rb index 1eb9767..99fd694 100644 --- a/config/application.rb +++ b/config/application.rb @@ -31,7 +31,7 @@ module Partynest ].freeze def settings(name) - config_for "settings/#{name}" + config_for("settings/#{name}").deep_symbolize_keys end # Initialize configuration defaults for originally generated Rails version. diff --git a/config/environments/production.rb b/config/environments/production.rb index b6d2b3b..9074f08 100644 --- a/config/environments/production.rb +++ b/config/environments/production.rb @@ -65,7 +65,7 @@ Rails.application.configure do config.log_tags = [:request_id] # Use a different cache store in production. - cache_conf = Rails.application.settings(:cache_store).deep_symbolize_keys + cache_conf = Rails.application.settings :cache_store config.cache_store = :redis_cache_store, { host: cache_conf[:host], port: cache_conf[:port], diff --git a/config/initializers/action_mailer_smtp_settings.rb b/config/initializers/action_mailer_smtp_settings.rb index d1a1cde..10c2901 100644 --- a/config/initializers/action_mailer_smtp_settings.rb +++ b/config/initializers/action_mailer_smtp_settings.rb @@ -2,7 +2,7 @@ # Be sure to restart your server when you modify this file. -conf = Rails.application.settings(:smtp).deep_symbolize_keys +conf = Rails.application.settings :smtp ActionMailer::Base.smtp_settings = { address: conf[:address], diff --git a/config/initializers/devise.rb b/config/initializers/devise.rb index 3d02fc1..c8f8158 100644 --- a/config/initializers/devise.rb +++ b/config/initializers/devise.rb @@ -2,7 +2,7 @@ # Be sure to restart your server when you modify this file. -conf = Rails.application.settings(:devise).deep_symbolize_keys +conf = Rails.application.settings :devise # Use this hook to configure devise mailer, warden hooks and so forth. # Many of these configuration options can be set straight in your model. diff --git a/config/initializers/sidekiq.rb b/config/initializers/sidekiq.rb index 56375a9..6ca2c47 100644 --- a/config/initializers/sidekiq.rb +++ b/config/initializers/sidekiq.rb @@ -2,8 +2,8 @@ # Be sure to restart your server when you modify this file. -client_conf = Rails.application.settings(:sidekiq_client).deep_symbolize_keys -server_conf = Rails.application.settings(:sidekiq_server).deep_symbolize_keys +client_conf = Rails.application.settings :sidekiq_client +server_conf = Rails.application.settings :sidekiq_server Sidekiq.configure_client do |config| config.redis = { diff --git a/db/seeds.rb b/db/seeds.rb index dea7b88..dd7a446 100644 --- a/db/seeds.rb +++ b/db/seeds.rb @@ -10,7 +10,7 @@ country_state_names.each do |name| CountryState.create! name: name end -Rails.application.settings(:superuser).deep_symbolize_keys.tap do |config| +Rails.application.settings(:superuser).tap do |config| User.where(email: config[:email]).first_or_create! do |new_user| new_user.account = Account.create! new_user.password = config[:password]