X-Git-Url: https://git.openstreetmap.org./rails.git/blobdiff_plain/71255ea666faa8d27cc4edd791e84bc75bcbcb06..51dcf86f40200bf4728097868f45aa2fe12968f3:/Gemfile diff --git a/Gemfile b/Gemfile index f16f44a3a..b06702fb3 100644 --- a/Gemfile +++ b/Gemfile @@ -2,7 +2,7 @@ source 'http://rubygems.org' # Require rails -gem 'rails', '3.2.10' +gem 'rails', '3.2.11' # Require things which have moved to gems in ruby 1.9 gem 'bigdecimal', :platforms => :ruby_19 @@ -29,6 +29,7 @@ gem 'paperclip', '~> 2.0' gem 'deadlock_retry', '>= 1.2.0' gem 'i18n-js', '>= 3.0.0.rc2' gem 'rack-cors' +gem 'jsonify-rails' # We need ruby-openid 2.2.0 or later for ruby 1.9 support gem 'ruby-openid', '>= 2.2.0' @@ -66,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