X-Git-Url: https://git.openstreetmap.org./rails.git/blobdiff_plain/312bc4e72cdedc22dab831c8f5f23665e33bdc29..e05adbb917adef34700858e9c0b46cc81cf59120:/Gemfile?ds=sidebyside diff --git a/Gemfile b/Gemfile index 11008d943..5e7a2c16e 100644 --- a/Gemfile +++ b/Gemfile @@ -1,7 +1,7 @@ source 'http://rubygems.org' # Require rails -gem 'rails', '4.0.1' +gem 'rails', '4.0.2' # Require things which have moved to gems in ruby 1.9 gem 'bigdecimal', "~> 1.1.0", :platforms => :ruby_19 @@ -41,7 +41,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', '>= 6.0.0' +gem 'composite_primary_keys', '>= 6.0.1' gem 'http_accept_language', '~> 2.0.0' gem 'paperclip', '~> 3.0' gem 'deadlock_retry', '>= 1.2.0'