X-Git-Url: https://git.openstreetmap.org/rails.git/blobdiff_plain/14bc538681ca1e6b54dc2da67718e67ea6e1ec04..0a3aba7f891ba55a5500f02907cec15d44554eae:/Gemfile diff --git a/Gemfile b/Gemfile index fa3f38d79..4b2d2ba9e 100644 --- a/Gemfile +++ b/Gemfile @@ -2,7 +2,7 @@ source 'http://rubygems.org' # Require rails -gem 'rails', '3.2.8' +gem 'rails', '3.2.9' # Require things which have moved to gems in ruby 1.9 gem 'bigdecimal', :platforms => :ruby_19 @@ -13,6 +13,9 @@ gem 'pg' # Load jquery support gem 'jquery-rails' +# Load R2 for RTL conversion +gem 'r2' + # Load rails plugins gem 'rails-i18n', ">= 0.6.3" gem 'dynamic_form' @@ -25,6 +28,8 @@ 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' +gem 'jsonify-rails' # We need ruby-openid 2.2.0 or later for ruby 1.9 support gem 'ruby-openid', '>= 2.2.0'