Merge pull request #224 from y-yagi/update_rails

update rails to 4.2.5.2

Gemfile

@@ -12,7 +12,7 @@ gem 'elasticsearch-model'
 gem 'elasticsearch-rails'
 gem 'exception_notification'
 gem 'exception_notification-idobata'
-gem 'garage', github: 'cookpad/garage'
+gem 'the_garage'
 gem 'garage-doorkeeper'
 gem 'geocoder'
 gem 'rails-footnotes', '~> 4.0'
@@ -30,7 +30,7 @@ gem 'omniauth-oauth2', '1.3.1'
 gem 'picasa'
 gem 'pg'
 gem 'pg_array_parser'
-gem 'rails', '4.2.5.1'
+gem 'rails', '4.2.5.2'
 gem 'rambulance'
 gem 'rake-guardian'
 gem 'responders'

Gemfile.lock

@@ -1,20 +1,3 @@
-GIT
-  remote: git://github.com/cookpad/garage.git
-  revision: 9e9768a89208dbf08a935e1c403bca14e7c270c8
-  specs:
-    garage (1.5.5)
-      coffee-rails
-      haml
-      hashie
-      http_accept_language (>= 2.0.0)
-      oauth2
-      oj
-      rack-accept-default (~> 0.0.2)
-      rails (>= 4.0.0)
-      redcarpet (>= 3.1.1)
-      responders
-      sass-rails
-
 GIT
   remote: git://github.com/y-yagi/turbolinks.git
   revision: 75115a3c217f54b447b780061ae0279abae1f146
@@ -26,37 +9,37 @@ GEM
   remote: https://rubygems.org/
   remote: https://rails-assets.org/
   specs:
-    actionmailer (4.2.5.1)
-      actionpack (= 4.2.5.1)
-      actionview (= 4.2.5.1)
-      activejob (= 4.2.5.1)
+    actionmailer (4.2.5.2)
+      actionpack (= 4.2.5.2)
+      actionview (= 4.2.5.2)
+      activejob (= 4.2.5.2)
       mail (~> 2.5, >= 2.5.4)
       rails-dom-testing (~> 1.0, >= 1.0.5)
-    actionpack (4.2.5.1)
-      actionview (= 4.2.5.1)
-      activesupport (= 4.2.5.1)
+    actionpack (4.2.5.2)
+      actionview (= 4.2.5.2)
+      activesupport (= 4.2.5.2)
       rack (~> 1.6)
       rack-test (~> 0.6.2)
       rails-dom-testing (~> 1.0, >= 1.0.5)
       rails-html-sanitizer (~> 1.0, >= 1.0.2)
-    actionview (4.2.5.1)
-      activesupport (= 4.2.5.1)
+    actionview (4.2.5.2)
+      activesupport (= 4.2.5.2)
       builder (~> 3.1)
       erubis (~> 2.7.0)
       rails-dom-testing (~> 1.0, >= 1.0.5)
       rails-html-sanitizer (~> 1.0, >= 1.0.2)
     active_decorator (0.7.0)
-    activejob (4.2.5.1)
-      activesupport (= 4.2.5.1)
+    activejob (4.2.5.2)
+      activesupport (= 4.2.5.2)
       globalid (>= 0.3.0)
-    activemodel (4.2.5.1)
-      activesupport (= 4.2.5.1)
+    activemodel (4.2.5.2)
+      activesupport (= 4.2.5.2)
       builder (~> 3.1)
-    activerecord (4.2.5.1)
-      activemodel (= 4.2.5.1)
-      activesupport (= 4.2.5.1)
+    activerecord (4.2.5.2)
+      activemodel (= 4.2.5.2)
+      activesupport (= 4.2.5.2)
       arel (~> 6.0)
-    activesupport (4.2.5.1)
+    activesupport (4.2.5.2)
       i18n (~> 0.7)
       json (~> 1.7, >= 1.7.7)
       minitest (~> 5.1)
@@ -98,7 +81,7 @@ GEM
       coffee-script-source
       execjs
     coffee-script-source (1.10.0)
-    concurrent-ruby (1.0.0)
+    concurrent-ruby (1.0.1)
     coveralls (0.8.10)
       json (~> 1.8)
       rest-client (>= 1.6.8, < 2)
@@ -213,7 +196,7 @@ GEM
     mail (2.6.3)
       mime-types (>= 1.16, < 3)
     method_source (0.8.2)
-    mime-types (2.99)
+    mime-types (2.99.1)
     mini_portile2 (2.0.0)
     minitest (5.8.4)
     minitest-slow_test (0.1.0)
@@ -239,7 +222,7 @@ GEM
       multi_json (~> 1.3)
       multi_xml (~> 0.5)
       rack (>= 1.2, < 3)
-    oj (2.14.4)
+    oj (2.14.5)
     omniauth (1.3.1)
       hashie (>= 1.2, < 4)
       rack (>= 1.0, < 3)
@@ -285,16 +268,16 @@ GEM
       rack (>= 1.1.3)
     rack-test (0.6.3)
       rack (>= 1.0)
-    rails (4.2.5.1)
-      actionmailer (= 4.2.5.1)
-      actionpack (= 4.2.5.1)
-      actionview (= 4.2.5.1)
-      activejob (= 4.2.5.1)
-      activemodel (= 4.2.5.1)
-      activerecord (= 4.2.5.1)
-      activesupport (= 4.2.5.1)
+    rails (4.2.5.2)
+      actionmailer (= 4.2.5.2)
+      actionpack (= 4.2.5.2)
+      actionview (= 4.2.5.2)
+      activejob (= 4.2.5.2)
+      activemodel (= 4.2.5.2)
+      activerecord (= 4.2.5.2)
+      activesupport (= 4.2.5.2)
       bundler (>= 1.3.0, < 2.0)
-      railties (= 4.2.5.1)
+      railties (= 4.2.5.2)
       sprockets-rails
     rails-assets-bootstrap-css (3.3.6)
     rails-assets-bootstrap-tagsinput (0.7.1)
@@ -330,9 +313,9 @@ GEM
       rails_stdout_logging
     rails_serve_static_assets (0.0.5)
     rails_stdout_logging (0.0.4)
-    railties (4.2.5.1)
-      actionpack (= 4.2.5.1)
-      activesupport (= 4.2.5.1)
+    railties (4.2.5.2)
+      actionpack (= 4.2.5.2)
+      activesupport (= 4.2.5.2)
       rake (>= 0.8.7)
       thor (>= 0.18.1, < 2.0)
     raindrops (0.15.0)
@@ -391,14 +374,26 @@ GEM
     sprockets (3.5.2)
       concurrent-ruby (~> 1.0)
       rack (> 1, < 3)
-    sprockets-rails (3.0.1)
+    sprockets-rails (3.0.3)
       actionpack (>= 4.0)
       activesupport (>= 4.0)
       sprockets (>= 3.0.0)
     temple (0.7.6)
     term-ansicolor (1.3.2)
       tins (~> 1.0)
     terminal-table (1.5.2)
+    the_garage (2.0.2)
+      coffee-rails
+      haml
+      hashie
+      http_accept_language (>= 2.0.0)
+      oauth2
+      oj
+      rack-accept-default (~> 0.0.2)
+      rails (>= 4.0.0)
+      redcarpet (>= 3.1.1)
+      responders
+      sass-rails
     thor (0.19.1)
     thread_safe (0.3.5)
     tilt (2.0.2)
@@ -447,7 +442,6 @@ DEPENDENCIES
   elasticsearch-rails
   exception_notification
   exception_notification-idobata
-  garage!
   garage-doorkeeper
   geocoder
   guard
@@ -477,7 +471,7 @@ DEPENDENCIES
   pry-rails
   quiet_assets
   rack-mini-profiler
-  rails (= 4.2.5.1)
+  rails (= 4.2.5.2)
   rails-assets-bootstrap-css!
   rails-assets-bootstrap-tagsinput!
   rails-assets-fullcalendar!
@@ -497,6 +491,7 @@ DEPENDENCIES
   sass-rails (~> 5.0.0)
   slim-rails
   spring
+  the_garage
   turbolinks!
   uglifier (>= 1.3.0)
   unicorn