X-Git-Url: https://git.openstreetmap.org./rails.git/blobdiff_plain/4cba7a971e09c4ec0f711a30782605a4f9388827..c0bfc11d0320be65e57d12b35a50cc7001f10a9b:/Gemfile?ds=sidebyside

diff --git a/Gemfile b/Gemfile
index 14757dc94..76071aa2e 100644
--- a/Gemfile
+++ b/Gemfile
@@ -1,40 +1,80 @@
+# Gem source to use
 source 'http://rubygems.org'
 
-gem 'rails', '3.1.0'
+# Require rails
+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'
-gem 'arel', '>= 2.0.9'
+
+# 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'
+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.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', '= 0.1', :platforms => :ruby_18
+
+# Load libxml support for XML parsing and generation
 gem 'libxml-ruby', '>= 2.0.5', :require => 'libxml'
-gem 'rmagick', :require => 'RMagick'
-gem 'oauth', '>= 0.4.4'
-gem 'oauth-plugin', '>= 0.4.0.pre4'
-gem 'httpclient'
-gem 'SystemTimer', '>= 1.1.3', :require => 'system_timer'
+
+# Use for HTML sanitisation
 gem 'sanitize'
-gem 'rails-i18n-updater'
-gem 'validates_email_format_of', '>= 1.5.1'
-gem 'open_id_authentication', '>= 1.1.0'
-gem 'prototype-rails'
-gem 'rinku', '>= 1.2.2', :require => 'rails_rinku'
-gem 'dynamic_form'
+gem 'htmlentities'
+
+# Load SystemTimer for implementing request timeouts
+gem 'SystemTimer', '>= 1.1.3', :require => 'system_timer', :platforms => :ruby_18
 
-# Should only load if memcache is in use
-#gem 'memcached'
+# Load httpclient for SOAP support for Quova GeoIP queries
+gem 'httpclient'
 
-# Should only load if we're not in database offline mode
-gem 'composite_primary_keys', '= 4.0.0'
+# Load memcache in case we are using it
+gem 'memcached', '>= 1.4.1'
+
+# Gems useful for development
+group :development do
+  gem 'vendorer'
+end
 
-# Bundle gems for the local environment. Make sure to
-# put test-only gems in this group so their generators
-# and rake tasks are available in development mode:
-group :development, :test do
+# Gems needed for running tests
+group :test do
   gem 'timecop'
+  gem 'minitest', '~> 4.7.0', :platforms => [:ruby_19, :ruby_20]
 end
 
-# Gems used only for assets and not required
-# in production environments by default.
+# Gems needed for compiling assets
 group :assets do
-  gem 'sass-rails', "  ~> 3.1.0"
-  gem 'coffee-rails', "~> 3.1.0"
-  gem 'uglifier'
+  gem 'sass-rails', '~> 3.2.3'
+  gem 'coffee-rails', '~> 3.2.1'
+  gem 'uglifier', '>= 1.0.3'
+  gem 'therubyracer', '~> 0.10.2'
+  gem 'ejs'
 end