From 0e1d5d95a7f7f3099fb246e790de1f809da6e2d0 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Alberto=20Calder=C3=B3n=20Queimadelos?= Date: Thu, 8 Mar 2018 17:03:38 +0100 Subject: [PATCH] Revert "Make config.time_zone configurable at secrets.yml" --- config/application.rb | 2 +- config/secrets.yml.example | 3 --- 2 files changed, 1 insertion(+), 4 deletions(-) diff --git a/config/application.rb b/config/application.rb index 7cd7052d4..e851bc345 100644 --- a/config/application.rb +++ b/config/application.rb @@ -32,7 +32,7 @@ module Consul # Add lib to the autoload path config.autoload_paths << Rails.root.join('lib') - config.time_zone = Rails.application.secrets.time_zone + config.time_zone = 'Madrid' config.active_job.queue_adapter = :delayed_job # CONSUL specific custom overrides diff --git a/config/secrets.yml.example b/config/secrets.yml.example index 8dab81809..5157e350c 100644 --- a/config/secrets.yml.example +++ b/config/secrets.yml.example @@ -1,5 +1,4 @@ default: &default - time_zone: 'Madrid' secret_key_base: 56792feef405a59b18ea7db57b4777e855103882b926413d4afdfb8c0ea8aa86ea6649da4e729c5f5ae324c0ab9338f789174cf48c544173bc18fdc3b14262e4 maps: &maps @@ -41,7 +40,6 @@ staging: <<: *apis preproduction: - time_zone: 'Madrid' secret_key_base: "" server_name: "" rollbar_server_token: "" @@ -59,7 +57,6 @@ preproduction: <<: *apis production: - time_zone: 'Madrid' secret_key_base: "" server_name: "" rollbar_server_token: ""