X-Git-Url: https://git.openstreetmap.org./rails.git/blobdiff_plain/87d9ef8ea50e2f6c1df3b3b89e3b393e9bcdab90..963827d396959b856363417cc74749e79925c892:/Gemfile?ds=sidebyside diff --git a/Gemfile b/Gemfile index cca9853f9..76f1d3274 100644 --- a/Gemfile +++ b/Gemfile @@ -1,7 +1,7 @@ source 'https://rubygems.org' # Require rails -gem 'rails', '4.1.4' +gem 'rails', '4.1.6' # Require things which have moved to gems in ruby 1.9 gem 'bigdecimal', "~> 1.1.0", :platforms => :ruby_19 @@ -44,7 +44,7 @@ gem 'rinku', '>= 1.2.2', :require => 'rails_rinku' gem 'oauth-plugin', '>= 0.5.1' gem 'open_id_authentication', '>= 1.1.0' gem 'validates_email_format_of', '>= 1.5.1' -gem 'composite_primary_keys', '~> 7.0.3' +gem 'composite_primary_keys', '~> 7.0.10' gem 'http_accept_language', '~> 2.0.0' gem 'paperclip', '~> 4.0' gem 'deadlock_retry', '>= 1.2.0'