X-Git-Url: https://git.openstreetmap.org./rails.git/blobdiff_plain/7599f98957334d1924550205f7ba12a726de7eb0..c12fe5f6e82c9f0321825ba11eeec16e13f31b29:/Gemfile?ds=inline diff --git a/Gemfile b/Gemfile index 4b2d2ba9e..b06702fb3 100644 --- a/Gemfile +++ b/Gemfile @@ -2,7 +2,7 @@ source 'http://rubygems.org' # Require rails -gem 'rails', '3.2.9' +gem 'rails', '3.2.11' # Require things which have moved to gems in ruby 1.9 gem 'bigdecimal', :platforms => :ruby_19 @@ -23,7 +23,7 @@ gem 'rinku', '>= 1.2.2', :require => 'rails_rinku' gem 'oauth-plugin', '>= 0.4.1', :require => 'oauth-plugin' gem 'open_id_authentication', '>= 1.1.0' gem 'validates_email_format_of', '>= 1.5.1' -gem 'composite_primary_keys', '>= 5.0.9' +gem 'composite_primary_keys', '>= 5.0.10' gem 'http_accept_language', '>= 1.0.2' gem 'paperclip', '~> 2.0' gem 'deadlock_retry', '>= 1.2.0' @@ -67,6 +67,6 @@ group :assets do gem 'sass-rails', '~> 3.2.3' gem 'coffee-rails', '~> 3.2.1' gem 'uglifier', '>= 1.0.3' - gem 'therubyracer' + gem 'therubyracer', '~> 0.10.2' gem 'ejs' end