X-Git-Url: https://git.openstreetmap.org./rails.git/blobdiff_plain/71255ea666faa8d27cc4edd791e84bc75bcbcb06..30f8e412bc0b43e62b46b99f2cbe3d0c7ac13d51:/Gemfile diff --git a/Gemfile b/Gemfile index f16f44a3a..787a08640 100644 --- a/Gemfile +++ b/Gemfile @@ -2,7 +2,7 @@ source 'http://rubygems.org' # Require rails -gem 'rails', '3.2.10' +gem 'rails', '3.2.12' # Require things which have moved to gems in ruby 1.9 gem 'bigdecimal', :platforms => :ruby_19 @@ -37,7 +37,7 @@ gem 'ruby-openid', '>= 2.2.0' gem 'redcarpet' # Character conversion support for ruby 1.8 -gem 'iconv', :platforms => :ruby_18 +gem 'iconv', '= 0.1', :platforms => :ruby_18 # Load libxml support for XML parsing and generation gem 'libxml-ruby', '>= 2.0.5', :require => 'libxml' @@ -66,6 +66,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