Merge branch 'chapter-6' into modeling-users

chriserin · Aug 26, 2010 · 0f38a37 · 0f38a37
2 parents 8753262 + e131fae
commit 0f38a37
Show file tree

Hide file tree

Showing 2 changed files with 1 addition and 10 deletions.
diff --git a/Gemfile b/Gemfile
@@ -6,7 +6,7 @@ gem 'gravatar_image_tag', '0.1.0'
 
 group :development do
   gem 'rspec-rails', '2.0.0.beta.18'
-  gem 'annotate-models'
+  gem 'annotate-models', '1.0.4'
 end
 
 group :test do

diff --git a/db/migrate/20100822012431_add_email_uniqueness_index.rb b/db/migrate/20100822012431_add_email_uniqueness_index.rb