X-Git-Url: https://git.openstreetmap.org/rails.git/blobdiff_plain/ba97fca4f271132a4c0bad9d298b6a97ecb049c4..97b1290f1a9f784566cc352e744dc2d009ae49ce:/Gemfile

diff --git a/Gemfile b/Gemfile
index 2fd810a09..e8a92ccad 100644
--- a/Gemfile
+++ b/Gemfile
@@ -1,6 +1,6 @@
 source 'http://rubygems.org'
 
-gem 'rails', '3.0.9'
+gem 'rails', '3.1.0'
 
 gem 'pg'
 gem 'arel', '>= 2.0.9'
@@ -12,14 +12,16 @@ gem 'httpclient'
 gem 'SystemTimer', '>= 1.1.3', :require => 'system_timer'
 gem 'sanitize'
 gem 'rails-i18n-updater'
-gem 'validates_email_format_of', '>= 1.4.5'
-gem 'open_id_authentication', '>= 1.0.0'
+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'
 
 # Should only load if memcache is in use
 #gem 'memcached'
 
 # Should only load if we're not in database offline mode
-gem 'composite_primary_keys', '>= 3.1.6'
+gem 'composite_primary_keys', '= 4.0.0'
 
 # Bundle gems for the local environment. Make sure to
 # put test-only gems in this group so their generators
@@ -27,3 +29,11 @@ gem 'composite_primary_keys', '>= 3.1.6'
 group :development, :test do
   gem 'timecop'
 end
+
+# Gems used only for assets and not required
+# in production environments by default.
+group :assets do
+  gem 'sass-rails', "  ~> 3.1.0"
+  gem 'coffee-rails', "~> 3.1.0"
+  gem 'uglifier'
+end