Require i18n-js 3.0.0.rc5.3 for proper dependency on configuration

diff --git a/Gemfile b/Gemfile
index 5e7a2c16ebcb7727536e2c0e5c9e08e55899f79c..b8b1430e9f49d8a13e195d4ff4753d7206b3bc12 100644 (file)
--- a/Gemfile
+++ b/Gemfile
@@ -45,7 +45,7 @@ gem 'composite_primary_keys', '>= 6.0.1'
 gem 'http_accept_language', '~> 2.0.0'
 gem 'paperclip', '~> 3.0'
 gem 'deadlock_retry', '>= 1.2.0'
 gem 'http_accept_language', '~> 2.0.0'
 gem 'paperclip', '~> 3.0'
 gem 'deadlock_retry', '>= 1.2.0'

-gem 'openstreetmap-i18n-js', '>= 3.0.0.rc5.2', :require => 'i18n-js'
+gem 'openstreetmap-i18n-js', '>= 3.0.0.rc5.3', :require => 'i18n-js'

 gem 'rack-cors'
 gem 'actionpack-page_caching'
 
 gem 'rack-cors'
 gem 'actionpack-page_caching'
 

diff --git a/Gemfile.lock b/Gemfile.lock
index fe70cbfc546bad08514d6b8ef18d33503dadd021..f5de1ef1fa6c9b547b04b65b00de4ffafa32feed 100644 (file)
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -98,7 +98,7 @@ GEM
       rack (~> 1.2)
     open_id_authentication (1.2.0)
       rack-openid (~> 1.3)
       rack (~> 1.2)
     open_id_authentication (1.2.0)
       rack-openid (~> 1.3)

-    openstreetmap-i18n-js (3.0.0.rc5.2)
+    openstreetmap-i18n-js (3.0.0.rc5.3)

       i18n
     paperclip (3.5.2)
       activemodel (>= 3.0.0)
       i18n
     paperclip (3.5.2)
       activemodel (>= 3.0.0)


@@ -191,7 +191,7 @@ DEPENDENCIES
   minitest (~> 4.7.0)
   oauth-plugin (>= 0.5.1)
   open_id_authentication (>= 1.1.0)
   minitest (~> 4.7.0)
   oauth-plugin (>= 0.5.1)
   open_id_authentication (>= 1.1.0)

-  openstreetmap-i18n-js (>= 3.0.0.rc5.2)
+  openstreetmap-i18n-js (>= 3.0.0.rc5.3)

   paperclip (~> 3.0)
   pg
   psych
   paperclip (~> 3.0)
   pg
   psych