Force notes list to be realised in notes#mine

[rails.git] / Gemfile

diff --git a/Gemfile b/Gemfile
index 4b2d2ba9e0351ce6d7e2de3ab2ad17fbc1115498..5f63da33fa1edde473498cf276cacb5d4717a73a 100644 (file)
--- a/Gemfile
+++ b/Gemfile
@@ -2,7 +2,7 @@
 source 'http://rubygems.org'
 
 # Require rails
-gem 'rails', '3.2.9'
+gem 'rails', '3.2.12'
 
 # Require things which have moved to gems in ruby 1.9
 gem 'bigdecimal', :platforms => :ruby_19
@@ -23,7 +23,7 @@ gem 'rinku', '>= 1.2.2', :require => 'rails_rinku'
 gem 'oauth-plugin', '>= 0.4.1', :require => 'oauth-plugin'
 gem 'open_id_authentication', '>= 1.1.0'
 gem 'validates_email_format_of', '>= 1.5.1'
-gem 'composite_primary_keys', '>= 5.0.9'
+gem 'composite_primary_keys', '>= 5.0.10'
 gem 'http_accept_language', '>= 1.0.2'
 gem 'paperclip', '~> 2.0'
 gem 'deadlock_retry', '>= 1.2.0'
@@ -38,7 +38,7 @@ gem 'ruby-openid', '>= 2.2.0'
 gem 'redcarpet'
 
 # Character conversion support for ruby 1.8
-gem 'iconv', :platforms => :ruby_18
+gem 'iconv', '= 0.1', :platforms => :ruby_18
 
 # Load libxml support for XML parsing and generation
 gem 'libxml-ruby', '>= 2.0.5', :require => 'libxml'
@@ -56,10 +56,15 @@ gem 'httpclient'
 # Load memcache in case we are using it
 gem 'memcached', '>= 1.4.1'
 
+# Gems useful for development
+group :development do
+  gem 'vendorer'
+end
+
 # Gems needed for running tests
 group :test do
   gem 'timecop'
-  gem 'minitest', :platforms => :ruby_19
+  gem 'minitest', '~> 4.7.0', :platforms => :ruby_19
 end
 
 # Gems needed for compiling assets
@@ -67,6 +72,6 @@ group :assets do
   gem 'sass-rails', '~> 3.2.3'
   gem 'coffee-rails', '~> 3.2.1'
   gem 'uglifier', '>= 1.0.3'
-  gem 'therubyracer'
+  gem 'therubyracer', '~> 0.10.2'
   gem 'ejs'
 end