Sort out indentation

eladmeidar · Nov 26, 2009 · 4a084ff · 4a084ff
1 parent 83a72aa
commit 4a084ff
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 8 deletions.
diff --git a/config/initializers/session_store.rb b/config/initializers/session_store.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,

diff --git a/lib/config_system.rb b/lib/config_system.rb
@@ -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