Merge branch 'master' into ab-testing

allourideas · Feb 26, 2013 · 0fe349b · 0fe349b
2 parents 81c0dca + 148c3f7
commit 0fe349b
Show file tree

Hide file tree

Showing 19 changed files with 23 additions and 21 deletions.
diff --git a/Gemfile b/Gemfile
@@ -1,9 +1,10 @@
 source :rubygems
 source "http://gems.github.com"
 
-gem "rails", "2.3.15"
+gem "rails", "2.3.17"
 gem "rake", "~> 0.9.0"
 gem "multi_json", "1.0.4"
+gem "json"
 gem "airbrake", :require => 'airbrake/rails'
 gem "libxml-ruby", "2.2.2", :require => "libxml"
 gem "ambethia-smtp-tls", "1.1.2", :require => "smtp-tls"

diff --git a/Gemfile.lock b/Gemfile.lock
@@ -2,16 +2,16 @@ GEM
   remote: http://rubygems.org/
   remote: http://gems.github.com/
   specs:
-    actionmailer (2.3.15)
-      actionpack (= 2.3.15)
-    actionpack (2.3.15)
-      activesupport (= 2.3.15)
-      rack (~> 1.1.3)
-    activerecord (2.3.15)
-      activesupport (= 2.3.15)
-    activeresource (2.3.15)
-      activesupport (= 2.3.15)
-    activesupport (2.3.15)
+    actionmailer (2.3.17)
+      actionpack (= 2.3.17)
+    actionpack (2.3.17)
+      activesupport (= 2.3.17)
+      rack (~> 1.1.0)
+    activerecord (2.3.17)
+      activesupport (= 2.3.17)
+    activeresource (2.3.17)
+      activesupport (= 2.3.17)
+    activesupport (2.3.17)
     addressable (2.3.2)
     airbrake (3.1.4)
       builder
@@ -96,7 +96,7 @@ GEM
       responders (~> 0.4.3)
     jferris-mocha (0.9.5.0.1241126838)
       rake
-    json (1.7.5)
+    json (1.7.7)
     json_pure (1.7.5)
     libwebsocket (0.1.5)
       addressable
@@ -117,15 +117,15 @@ GEM
       faye-websocket (~> 0.4, >= 0.4.4)
       http_parser.rb (~> 0.5.3)
       multi_json (~> 1.0)
-    rack (1.1.4)
+    rack (1.1.6)
     rack-test (0.6.2)
       rack (>= 1.0)
-    rails (2.3.15)
-      actionmailer (= 2.3.15)
-      actionpack (= 2.3.15)
-      activerecord (= 2.3.15)
-      activeresource (= 2.3.15)
-      activesupport (= 2.3.15)
+    rails (2.3.17)
+      actionmailer (= 2.3.17)
+      actionpack (= 2.3.17)
+      activerecord (= 2.3.17)
+      activeresource (= 2.3.17)
+      activesupport (= 2.3.17)
       rake (>= 0.8.3)
     rake (0.9.6)
     redis (2.2.2)
@@ -191,6 +191,7 @@ DEPENDENCIES
   i18n (= 0.3.7)
   inherited_resources (= 1.0.4)
   jferris-mocha (= 0.9.5.0.1241126838)
+  json
   libxml-ruby (= 2.2.2)
   mime-types (= 1.16)
   multi_json (= 1.0.4)
@@ -199,7 +200,7 @@ DEPENDENCIES
   paperclip (= 2.3.1.1)
   pickle (~> 0.4.7)
   poltergeist (~> 1.0.1)
-  rails (= 2.3.15)
+  rails (= 2.3.17)
   rake (~> 0.9.0)
   redis (~> 2.2.1)
   redis-store (= 1.0.0.1)

diff --git a/config/environment.rb b/config/environment.rb
@@ -1,7 +1,7 @@
 # Be sure to restart your server when you modify this file
 
 # Specifies gem version of Rails to use when vendor/rails is not present
-RAILS_GEM_VERSION = '2.3.15' unless defined? RAILS_GEM_VERSION
+RAILS_GEM_VERSION = '2.3.17' unless defined? RAILS_GEM_VERSION
 
 # Bootstrap the Rails environment, frameworks, and default configuration
 require File.join(File.dirname(__FILE__), 'boot')

diff --git a/vendor/cache/actionmailer-2.3.15.gem b/vendor/cache/actionmailer-2.3.15.gem
diff --git a/vendor/cache/actionmailer-2.3.17.gem b/vendor/cache/actionmailer-2.3.17.gem
diff --git a/vendor/cache/actionpack-2.3.15.gem b/vendor/cache/actionpack-2.3.15.gem
diff --git a/vendor/cache/actionpack-2.3.17.gem b/vendor/cache/actionpack-2.3.17.gem
diff --git a/vendor/cache/activerecord-2.3.15.gem b/vendor/cache/activerecord-2.3.15.gem
diff --git a/vendor/cache/activerecord-2.3.17.gem b/vendor/cache/activerecord-2.3.17.gem
diff --git a/vendor/cache/activeresource-2.3.15.gem b/vendor/cache/activeresource-2.3.15.gem
diff --git a/vendor/cache/activeresource-2.3.17.gem b/vendor/cache/activeresource-2.3.17.gem
diff --git a/vendor/cache/activesupport-2.3.15.gem b/vendor/cache/activesupport-2.3.15.gem
diff --git a/vendor/cache/activesupport-2.3.17.gem b/vendor/cache/activesupport-2.3.17.gem
diff --git a/vendor/cache/json-1.7.5.gem b/vendor/cache/json-1.7.5.gem
diff --git a/vendor/cache/json-1.7.7.gem b/vendor/cache/json-1.7.7.gem
diff --git a/vendor/cache/rack-1.1.4.gem b/vendor/cache/rack-1.1.4.gem
diff --git a/vendor/cache/rack-1.1.6.gem b/vendor/cache/rack-1.1.6.gem
diff --git a/vendor/cache/rails-2.3.15.gem b/vendor/cache/rails-2.3.15.gem
diff --git a/vendor/cache/rails-2.3.17.gem b/vendor/cache/rails-2.3.17.gem