X-Git-Url: https://git.openstreetmap.org./rails.git/blobdiff_plain/11799d729e72e630724ddd988a0dba669d24529e..d1727377a817ca66acb65b5c854dad35aed19ac1:/Gemfile?ds=inline

diff --git a/Gemfile b/Gemfile
index b2aef90c1..08dafa0cc 100644
--- a/Gemfile
+++ b/Gemfile
@@ -1,28 +1,52 @@
+# Gem source to use
 source 'http://rubygems.org'
 
-gem 'rails', '3.0.4'
+# Require rails
+gem 'rails', '3.1.3'
 
+# Require the postgres database driver
 gem 'pg'
-gem 'arel', '>= 2.0.8'
+
+# Load jquery support
+gem 'jquery-rails'
+
+# Load rails plugins
+gem 'rails-i18n-updater'
+gem 'dynamic_form'
+gem 'rinku', '>= 1.2.2', :require => 'rails_rinku'
+gem 'oauth-plugin', '>= 0.4.0.pre7'
+gem 'open_id_authentication', '>= 1.1.0'
+gem 'validates_email_format_of', '>= 1.5.1'
+gem 'composite_primary_keys', '>= 4.1.1'
+
+# Load libxml support for XML parsing and generation
 gem 'libxml-ruby', '>= 2.0.5', :require => 'libxml'
+
+# Load ImageMagick support for user picture resizing
 gem 'rmagick', :require => 'RMagick'
-gem 'oauth', '>= 0.4.3'
-gem 'oauth-plugin', '> 0.3.14'
-gem 'httpclient'
-gem 'SystemTimer', '>= 1.1.3', :require => 'system_timer'
+
+# Load HTML sanitizer
 gem 'sanitize'
-gem 'rails-i18n-updater'
-gem 'validates_email_format_of', '>= 1.4.2'
 
-# Should only load if memcache is in use
-gem 'memcached'
+# Load SystemTimer for implementing request timeouts
+gem 'SystemTimer', '>= 1.1.3', :require => 'system_timer', :platforms => :ruby_18
 
-# Should only load if we're not in database offline mode
-gem 'composite_primary_keys', '>= 3.1.1'
+# Load httpclient for SOAP support for Quova GeoIP queries
+gem 'httpclient'
 
-# 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
+# Load memcache in case we are using it
+gem 'memcache-client'
+gem 'memcached'
+
+# Gems needed for running tests
+group :test do
   gem 'timecop'
 end
+
+# Gems needed for compiling assets
+group :assets do
+  gem 'sass-rails', "  ~> 3.1.0"
+  gem 'coffee-rails', "~> 3.1.0"
+  gem 'uglifier'
+  gem 'therubyracer'
+end