X-Git-Url: https://git.openstreetmap.org/rails.git/blobdiff_plain/d405637b05783bf14a6bb276f3bc63ec33a1ac23..ca8e1bf18822e77acda9437c9980d5359894a502:/Gemfile

diff --git a/Gemfile b/Gemfile
index a75a9279a..a580bcea0 100644
--- a/Gemfile
+++ b/Gemfile
@@ -2,7 +2,7 @@
 source 'http://rubygems.org'
 
 # Require rails
-gem 'rails', '3.1.3'
+gem 'rails', '3.2.0'
 
 # Require the postgres database driver
 gem 'pg'
@@ -18,6 +18,7 @@ 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.2'
+gem 'http_accept_language', '>= 1.0.2'
 
 # Character conversion support for ruby 1.8
 gem 'iconv', :platforms => :ruby_18
@@ -48,8 +49,8 @@ end
 
 # 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'
 end