X-Git-Url: https://git.openstreetmap.org./rails.git/blobdiff_plain/5bd428015ad49322f536d7fbc3500480b96e19c0..3ef02b86f00e9f57d1a5f938c4de209b26d5b61b:/Gemfile diff --git a/Gemfile b/Gemfile index e04a0810a..4644d07ea 100644 --- a/Gemfile +++ b/Gemfile @@ -2,7 +2,7 @@ source 'http://rubygems.org' # Require rails -gem 'rails', '3.2.7' +gem 'rails', '3.2.8' # Require things which have moved to gems in ruby 1.9 gem 'bigdecimal', :platforms => :ruby_19 @@ -20,17 +20,16 @@ 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.8' +gem 'composite_primary_keys', '>= 5.0.9' gem 'http_accept_language', '>= 1.0.2' gem 'paperclip', '~> 2.0' gem 'deadlock_retry', '>= 1.2.0' +gem 'i18n-js', '>= 3.0.0.rc2' +gem 'rack-cors' # We need ruby-openid 2.2.0 or later for ruby 1.9 support gem 'ruby-openid', '>= 2.2.0' -# Browser detection support -gem 'browser' - # Markdown formatting support gem 'redcarpet' @@ -65,4 +64,5 @@ group :assets do gem 'coffee-rails', '~> 3.2.1' gem 'uglifier', '>= 1.0.3' gem 'therubyracer' + gem 'ejs' end