Updated the environment to use the psych yaml parser

sbansal · Jan 23, 2012 · eba113f · eba113f
1 parent 15100f4
commit eba113f
Show file tree

Hide file tree

Showing 2 changed files with 29 additions and 27 deletions.
diff --git a/Gemfile.lock b/Gemfile.lock
@@ -30,21 +30,21 @@ GEM
     activesupport (3.1.1)
       multi_json (~> 1.0)
     addressable (2.2.6)
-    ansi (1.3.0)
+    ansi (1.4.1)
     arel (2.2.1)
     asset_sync (0.2.5)
       activemodel
       fog
     bcrypt-ruby (3.0.1)
     builder (3.0.0)
-    client_side_validations (3.1.3)
+    client_side_validations (3.1.4)
     coffee-rails (3.1.1)
       coffee-script (>= 2.2.0)
       railties (~> 3.1.0)
     coffee-script (2.2.0)
       coffee-script-source
       execjs
-    coffee-script-source (1.1.2)
+    coffee-script-source (1.2.0)
     delayed_job (3.0.0)
       activesupport (~> 3.0)
     delayed_job_active_record (0.3.1)
@@ -56,18 +56,18 @@ GEM
       haml (~> 3.1.3)
       rdoc
       sinatra (>= 0.9.2)
-    devise (1.5.2)
+    devise (1.5.3)
       bcrypt-ruby (~> 3.0)
       orm_adapter (~> 0.0.3)
       warden (~> 1.1)
     erubis (2.7.0)
-    excon (0.9.4)
-    execjs (1.2.9)
+    excon (0.9.5)
+    execjs (1.3.0)
       multi_json (~> 1.0)
-    faraday (0.7.5)
-      addressable (~> 2.2.6)
-      multipart-post (~> 1.1.3)
-      rack (>= 1.1.0, < 2)
+    faraday (0.7.6)
+      addressable (~> 2.2)
+      multipart-post (~> 1.1)
+      rack (~> 1.1)
     fog (1.1.2)
       builder
       excon (~> 0.9.0)
@@ -83,27 +83,27 @@ GEM
     hike (1.2.1)
     hirb (0.6.0)
     i18n (0.6.0)
-    jquery-rails (1.0.16)
+    jquery-rails (1.0.19)
       railties (~> 3.0)
       thor (~> 0.14)
-    json (1.6.1)
+    json (1.6.5)
     mail (2.3.0)
       i18n (>= 0.4.0)
       mime-types (~> 1.16)
       treetop (~> 1.4.8)
     mime-types (1.17.2)
-    multi_json (1.0.3)
+    multi_json (1.0.4)
     multipart-post (1.1.4)
-    mysql2 (0.3.7)
+    mysql2 (0.3.11)
     net-scp (1.0.4)
       net-ssh (>= 1.99.1)
     net-ssh (2.3.0)
     newrelic_rpm (3.3.1)
     nokogiri (1.5.0)
-    orm_adapter (0.0.5)
-    pg (0.11.0)
+    orm_adapter (0.0.6)
+    pg (0.12.2)
     polyglot (0.3.3)
-    rack (1.3.5)
+    rack (1.3.6)
     rack-cache (1.1)
       rack (>= 0.4)
     rack-google_analytics (1.0.2)
@@ -132,20 +132,19 @@ GEM
       rdoc (~> 3.4)
       thor (~> 0.14.6)
     rake (0.9.2.2)
-    rdoc (3.11)
+    rdoc (3.12)
       json (~> 1.4)
     ruby-hmac (0.4.0)
-    sass (3.1.10)
-    sass-rails (3.1.4)
+    sass (3.1.12)
+    sass-rails (3.1.5)
       actionpack (~> 3.1.0)
       railties (~> 3.1.0)
-      sass (>= 3.1.4)
-      sprockets (~> 2.0.0)
+      sass (~> 3.1.10)
       tilt (~> 1.3.2)
     simple_oauth (0.1.5)
-    sinatra (1.3.1)
-      rack (~> 1.3, >= 1.3.4)
-      rack-protection (~> 1.1, >= 1.1.2)
+    sinatra (1.3.2)
+      rack (~> 1.3, >= 1.3.6)
+      rack-protection (~> 1.2)
       tilt (~> 1.3, >= 1.3.3)
     sprockets (2.0.3)
       hike (~> 1.2)
@@ -163,8 +162,8 @@ GEM
       faraday (~> 0.7)
       multi_json (~> 1.0)
       simple_oauth (~> 0.1)
-    tzinfo (0.3.30)
-    uglifier (1.0.4)
+    tzinfo (0.3.31)
+    uglifier (1.2.2)
       execjs (>= 0.3.0)
       multi_json (>= 1.0.2)
     warden (1.1.0)

diff --git a/config/environment.rb b/config/environment.rb
@@ -1,3 +1,6 @@
+require 'yaml' 
+YAML::ENGINE.yamler= 'psych'
+
 # Load the rails application
 require File.expand_path('../application', __FILE__)