Permalink
Browse files

Sort out indentation

  • Loading branch information...
1 parent 83a72aa commit 4a084ff3a1be622533c6de7e629e2908c648dc5d @jamesu jamesu committed Nov 26, 2009
Showing with 8 additions and 8 deletions.
  1. +1 −1 config/initializers/session_store.rb
  2. +7 −7 lib/config_system.rb
@@ -8,7 +8,7 @@
# Note: make sure you have keys in config/config.yml
ActionController::Base.session = {
:key => AppConfig.session_key,
- :secret => AppConfig.session_secret
+ :secret => AppConfig.session_secret
}
# Use the database for sessions instead of the cookie-based default,
View
@@ -31,14 +31,14 @@ def self.init
# Determine what we are running under
AppConfig.server = self.detect_server
- # Load from app_keys.yml for session keys
- session_key_settings = YAML.load_file("config/app_keys.yml") rescue {}
- # Load from config.yml if it's present
- config_yml_settings = YAML.load_file('config/config.yml')[RAILS_ENV] rescue {}
+ # Load from app_keys.yml for session keys
+ session_key_settings = YAML.load_file("config/app_keys.yml") rescue {}
+ # Load from config.yml if it's present
+ config_yml_settings = YAML.load_file('config/config.yml')[RAILS_ENV] rescue {}
- session_key_settings.merge(config_yml_settings).merge(ENV).each do |key, value|
- AppConfig.send("#{key}=", value)
- end
+ session_key_settings.merge(config_yml_settings).merge(ENV).each do |key, value|
+ AppConfig.send("#{key}=", value)
+ end
end
def self.detect_server

0 comments on commit 4a084ff

Please sign in to comment.