Update to rearview-1.2.1

livingsocial · Mar 24, 2014 · fae4684 · fae4684
1 parent eed1b54
commit fae4684
Show file tree

Hide file tree

Showing 26 changed files with 15 additions and 21 deletions.
diff --git a/Gemfile.lock b/Gemfile.lock
@@ -35,12 +35,9 @@ GEM
       tzinfo (~> 0.3.37)
     ancestry (2.0.0)
       activerecord (>= 3.0.0)
-    arel (4.0.1)
-    atomic (1.1.14)
-    atomic (1.1.14-java)
+    arel (4.0.2)
+    atomic (1.1.16-java)
     bcrypt (3.1.7-java)
-    bcrypt-ruby (3.1.5-java)
-      bcrypt (>= 3.1.3)
     bouncy-castle-java (1.5.0147)
     broach (0.3.0)
       multi_json (~> 1.7)
@@ -56,8 +53,8 @@ GEM
       coffee-script-source
       execjs
     coffee-script-source (1.6.3)
-    devise (3.2.3)
-      bcrypt-ruby (~> 3.0)
+    devise (3.2.4)
+      bcrypt (~> 3.0)
       orm_adapter (~> 0.1)
       railties (>= 3.2.6, < 5)
       thread_safe (~> 0.1)
@@ -93,7 +90,6 @@ GEM
       thor (>= 0.14, < 2.0)
     jruby-openssl (0.9.4)
       bouncy-castle-java (>= 1.5.0147)
-    json (1.8.1)
     json (1.8.1-java)
     jwt (0.1.8)
       multi_json (>= 1.5)
@@ -103,7 +99,7 @@ GEM
     method_source (0.8.2)
     mime-types (1.25.1)
     minitest (4.7.5)
-    multi_json (1.8.2)
+    multi_json (1.9.2)
     multi_xml (0.5.5)
     multipart-post (2.0.0)
     nap (0.6.0)
@@ -123,8 +119,8 @@ GEM
       oauth2 (~> 0.8.0)
       omniauth (~> 1.0)
     orm_adapter (0.5.0)
-    polyglot (0.3.3)
-    protected_attributes (1.0.5)
+    polyglot (0.3.4)
+    protected_attributes (1.0.7)
       activemodel (>= 4.0.1, < 5.0)
     pry (0.9.12.4)
       coderay (~> 1.0)
@@ -155,10 +151,10 @@ GEM
       activesupport (= 4.0.2)
       rake (>= 0.8.7)
       thor (>= 0.18.1, < 2.0)
-    rake (10.1.1)
+    rake (10.2.0)
     rdoc (3.12.2)
       json (~> 1.4)
-    rearview (1.2.0-java)
+    rearview (1.2.1-java)
       ancestry (~> 2.0.0)
       broach (~> 0.3.0)
       celluloid (~> 0.14.1)
@@ -193,7 +189,7 @@ GEM
     slop (3.4.7)
     spoon (0.0.4)
       ffi
-    sprockets (2.10.1)
+    sprockets (2.12.0)
       hike (~> 1.2)
       multi_json (~> 1.0)
       rack (~> 1.0)
@@ -207,11 +203,9 @@ GEM
     therubyrhino (2.0.2)
       therubyrhino_jar (>= 1.7.3)
     therubyrhino_jar (1.7.4)
-    thor (0.18.1)
-    thread_safe (0.1.3)
-      atomic
-    thread_safe (0.1.3-java)
-      atomic
+    thor (0.19.1)
+    thread_safe (0.3.1-java)
+      atomic (>= 1.1.7, < 2)
     tilt (1.4.1)
     timers (2.0.0)
       hitimes
@@ -220,7 +214,7 @@ GEM
       polyglot (>= 0.3.1)
     turbolinks (2.1.0)
       coffee-rails
-    tzinfo (0.3.38)
+    tzinfo (0.3.39)
     uglifier (2.4.0)
       execjs (>= 0.3.0)
       json (>= 1.8.0)

diff --git a/README.md b/README.md
@@ -25,7 +25,7 @@ Getting Started
 
 ### Get it
 
-[Download](https://github.com/livingsocial/rearview/archive/v1.2.0.zip) the latest release.
+[Download](https://github.com/livingsocial/rearview/archive/v1.2.1.zip) the latest release.
 
 ### Database Support
 

diff --git a/vendor/cache/arel-4.0.1.gem b/vendor/cache/arel-4.0.1.gem
diff --git a/vendor/cache/arel-4.0.2.gem b/vendor/cache/arel-4.0.2.gem
diff --git a/vendor/cache/atomic-1.1.14-java.gem b/vendor/cache/atomic-1.1.14-java.gem
diff --git a/vendor/cache/atomic-1.1.16-java.gem b/vendor/cache/atomic-1.1.16-java.gem
diff --git a/vendor/cache/bcrypt-ruby-3.1.5-java.gem b/vendor/cache/bcrypt-ruby-3.1.5-java.gem
diff --git a/vendor/cache/devise-3.2.3.gem b/vendor/cache/devise-3.2.3.gem
diff --git a/vendor/cache/devise-3.2.4.gem b/vendor/cache/devise-3.2.4.gem
diff --git a/vendor/cache/multi_json-1.8.2.gem b/vendor/cache/multi_json-1.8.2.gem
diff --git a/vendor/cache/multi_json-1.9.2.gem b/vendor/cache/multi_json-1.9.2.gem
diff --git a/vendor/cache/polyglot-0.3.3.gem b/vendor/cache/polyglot-0.3.3.gem
diff --git a/vendor/cache/polyglot-0.3.4.gem b/vendor/cache/polyglot-0.3.4.gem
diff --git a/vendor/cache/protected_attributes-1.0.5.gem b/vendor/cache/protected_attributes-1.0.5.gem
diff --git a/vendor/cache/protected_attributes-1.0.7.gem b/vendor/cache/protected_attributes-1.0.7.gem
diff --git a/vendor/cache/rake-10.1.1.gem b/vendor/cache/rake-10.1.1.gem
diff --git a/vendor/cache/rake-10.2.0.gem b/vendor/cache/rake-10.2.0.gem
diff --git a/vendor/cache/rearview-1.2.0-java.gem → vendor/cache/rearview-1.2.1-java.gem b/vendor/cache/rearview-1.2.0-java.gem → vendor/cache/rearview-1.2.1-java.gem
diff --git a/vendor/cache/sprockets-2.10.1.gem b/vendor/cache/sprockets-2.10.1.gem
diff --git a/vendor/cache/sprockets-2.12.0.gem b/vendor/cache/sprockets-2.12.0.gem
diff --git a/vendor/cache/thor-0.18.1.gem b/vendor/cache/thor-0.18.1.gem
diff --git a/vendor/cache/thor-0.19.1.gem b/vendor/cache/thor-0.19.1.gem
diff --git a/vendor/cache/thread_safe-0.1.3-java.gem b/vendor/cache/thread_safe-0.1.3-java.gem
diff --git a/vendor/cache/thread_safe-0.3.1-java.gem b/vendor/cache/thread_safe-0.3.1-java.gem
diff --git a/vendor/cache/tzinfo-0.3.38.gem b/vendor/cache/tzinfo-0.3.38.gem
diff --git a/vendor/cache/tzinfo-0.3.39.gem b/vendor/cache/tzinfo-0.3.39.gem