X-Git-Url: https://git.openstreetmap.org/rails.git/blobdiff_plain/c3436ec9c415c5ce843d36e1746a3d8b75f50820..1154be55fa8ed7088213fb23b276182745f1b4f1:/Gemfile

diff --git a/Gemfile b/Gemfile
index 40a8b6628..7b60d70e0 100644
--- a/Gemfile
+++ b/Gemfile
@@ -2,7 +2,7 @@
 source 'http://rubygems.org'
 
 # Require rails
-gem 'rails', '3.1.0'
+gem 'rails', '3.1.1'
 
 # Require the postgres database driver
 gem 'pg'
@@ -17,7 +17,7 @@ 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.0.0'
+gem 'composite_primary_keys', '>= 4.1.1'
 
 # Load libxml support for XML parsing and generation
 gem 'libxml-ruby', '>= 2.0.5', :require => 'libxml'
@@ -35,6 +35,7 @@ gem 'SystemTimer', '>= 1.1.3', :require => 'system_timer'
 gem 'httpclient'
 
 # Load memcache in case we are using it
+gem 'memcache-client'
 gem 'memcached'
 
 # Gems needed for running tests
@@ -47,4 +48,5 @@ group :assets do
   gem 'sass-rails', "  ~> 3.1.0"
   gem 'coffee-rails', "~> 3.1.0"
   gem 'uglifier'
+  gem 'therubyracer'
 end