X-Git-Url: https://git.openstreetmap.org/rails.git/blobdiff_plain/65a3848fccd9c79a2717f2c0ccc3096692b5aa33..11799d729e72e630724ddd988a0dba669d24529e:/Gemfile diff --git a/Gemfile b/Gemfile index bcdbc75c9..b2aef90c1 100644 --- a/Gemfile +++ b/Gemfile @@ -1,8 +1,9 @@ source 'http://rubygems.org' -gem 'rails', '3.0.3' +gem 'rails', '3.0.4' gem 'pg' +gem 'arel', '>= 2.0.8' gem 'libxml-ruby', '>= 2.0.5', :require => 'libxml' gem 'rmagick', :require => 'RMagick' gem 'oauth', '>= 0.4.3' @@ -11,12 +12,13 @@ gem 'httpclient' gem 'SystemTimer', '>= 1.1.3', :require => 'system_timer' gem 'sanitize' gem 'rails-i18n-updater' +gem 'validates_email_format_of', '>= 1.4.2' # 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.0.0.b3' +gem 'composite_primary_keys', '>= 3.1.1' # Bundle gems for the local environment. Make sure to # put test-only gems in this group so their generators