X-Git-Url: https://git.openstreetmap.org/rails.git/blobdiff_plain/62e571a4aaa7324fe56c6c58a0dca5f943e7f9ee..e5c8dc9c77a0ac7abbc2e7c1c7e91a018450d8aa:/Gemfile diff --git a/Gemfile b/Gemfile index 2de8c0cf2..14757dc94 100644 --- a/Gemfile +++ b/Gemfile @@ -1,6 +1,6 @@ source 'http://rubygems.org' -gem 'rails', '3.0.10' +gem 'rails', '3.1.0' gem 'pg' gem 'arel', '>= 2.0.9' @@ -14,12 +14,15 @@ 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' # 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.10' +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 +30,11 @@ gem 'composite_primary_keys', '= 3.1.10' 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