Update to iD v2.4.3

[rails.git] / Gemfile

diff --git a/Gemfile b/Gemfile
index 4ce4a75f5e8de696cbf30ce71097d71fb57b7a94..ae1b472a2aa0bbdc5ac6e34d7c2dae3988765105 100644 (file)
--- a/Gemfile
+++ b/Gemfile
@@ -1,7 +1,7 @@
 source "https://rubygems.org"
 
 # Require rails
 source "https://rubygems.org"
 
 # Require rails

-gem "rails", "5.0.4"
+gem "rails", "5.0.6"

 
 # Require things which have moved to gems in ruby 1.9
 gem "bigdecimal", "~> 1.1.0", :platforms => :ruby_19
 
 # Require things which have moved to gems in ruby 1.9
 gem "bigdecimal", "~> 1.1.0", :platforms => :ruby_19


@@ -32,7 +32,7 @@ gem "jquery-rails"
 gem "jsonify-rails"
 
 # Use R2 for RTL conversion
 gem "jsonify-rails"
 
 # Use R2 for RTL conversion

-gem "r2"
+gem "r2", "~> 0.2.7"

 
 # Use autoprefixer to generate CSS prefixes
 gem "autoprefixer-rails"
 
 # Use autoprefixer to generate CSS prefixes
 gem "autoprefixer-rails"


@@ -43,11 +43,11 @@ gem "image_optim_rails"
 # Load rails plugins
 gem "actionpack-page_caching"
 gem "composite_primary_keys", "~> 9.0.7"
 # Load rails plugins
 gem "actionpack-page_caching"
 gem "composite_primary_keys", "~> 9.0.7"

-gem "deadlock_retry", ">= 1.2.0"

 gem "dynamic_form"
 gem "http_accept_language", "~> 2.0.0"
 gem "i18n-js", ">= 3.0.0"
 gem "oauth-plugin", ">= 0.5.1"
 gem "dynamic_form"
 gem "http_accept_language", "~> 2.0.0"
 gem "i18n-js", ">= 3.0.0"
 gem "oauth-plugin", ">= 0.5.1"

+gem "openstreetmap-deadlock_retry", ">= 1.3.0", :require => "deadlock_retry"

 gem "paperclip", "~> 4.0"
 gem "rack-cors"
 gem "rails-i18n", "~> 4.0.0"
 gem "paperclip", "~> 4.0"
 gem "rack-cors"
 gem "rails-i18n", "~> 4.0.0"


@@ -113,7 +113,6 @@ group :test do
   gem "minitest", "~> 5.1", :platforms => [:ruby_19, :ruby_20]
   gem "rails-controller-testing"
   gem "rubocop"
   gem "minitest", "~> 5.1", :platforms => [:ruby_19, :ruby_20]
   gem "rails-controller-testing"
   gem "rubocop"

-  gem "timecop"

   gem "webmock"
 end
 
   gem "webmock"
 end