X-Git-Url: https://git.openstreetmap.org./rails.git/blobdiff_plain/a48f2ac8563759bdf366951c214d022c0528e785..7094370208712e77d92ea2ad0d76e160742d6c0a:/Gemfile?ds=sidebyside diff --git a/Gemfile b/Gemfile index 2511fd7ea..76071aa2e 100644 --- a/Gemfile +++ b/Gemfile @@ -2,7 +2,13 @@ source 'http://rubygems.org' # Require rails -gem 'rails', '3.2.2' +gem 'rails', '3.2.12' + +# Require things which have moved to gems in ruby 1.9 +gem 'bigdecimal', "~> 1.1.0", :platforms => :ruby_19 + +# Require things which have moved to gems in ruby 2.0 +gem 'psych', :platforms => :ruby_20 # Require the postgres database driver gem 'pg' @@ -10,23 +16,32 @@ gem 'pg' # Load jquery support gem 'jquery-rails' +# Load R2 for RTL conversion +gem 'r2' + # Load rails plugins -gem 'rails-i18n', ">= 0.5.2" +gem 'rails-i18n', ">= 0.6.3" gem 'dynamic_form' gem 'rinku', '>= 1.2.2', :require => 'rails_rinku' -gem 'oauth-plugin', '>= 0.4.0.pre7' +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.0' +gem 'composite_primary_keys', '>= 5.0.10' 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' # Markdown formatting support 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' @@ -44,9 +59,15 @@ gem 'httpclient' # Load memcache in case we are using it gem 'memcached', '>= 1.4.1' +# Gems useful for development +group :development do + gem 'vendorer' +end + # Gems needed for running tests group :test do gem 'timecop' + gem 'minitest', '~> 4.7.0', :platforms => [:ruby_19, :ruby_20] end # Gems needed for compiling assets @@ -54,5 +75,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