try rb-fsevent again, update factory-girl

orend · Mar 3, 2012 · 5545c61 · 5545c61
1 parent 211d7c8
commit 5545c61
Show file tree

Hide file tree

Showing 5 changed files with 4 additions and 2 deletions.
diff --git a/Gemfile b/Gemfile
@@ -45,7 +45,7 @@ group :test do
 end
 
 group :development do
-  #gem 'rb-fsevent', :require => false if RUBY_PLATFORM =~ /darwin/i
+  gem 'rb-fsevent', :require => false if RUBY_PLATFORM =~ /darwin/i
   gem 'annotate', '~> 2.4.1.beta'
   gem 'awesome_print'
 end

diff --git a/Gemfile.lock b/Gemfile.lock
@@ -67,7 +67,7 @@ GEM
     eventmachine (0.12.10)
     execjs (1.3.0)
       multi_json (~> 1.0)
-    factory_girl (2.6.0)
+    factory_girl (2.6.1)
       activesupport (>= 2.3.9)
     factory_girl_rails (1.7.0)
       factory_girl (~> 2.6.0)
@@ -119,6 +119,7 @@ GEM
       rdoc (~> 3.4)
       thor (~> 0.14.6)
     rake (0.9.2.2)
+    rb-fsevent (0.9.0)
     rdoc (3.12)
       json (~> 1.4)
     rspec (2.8.0)
@@ -188,6 +189,7 @@ DEPENDENCIES
   jquery-rails
   pg
   rails (= 3.2.2)
+  rb-fsevent
   rspec-rails
   sass-rails (~> 3.2.3)
   simplecov

diff --git a/vendor/cache/factory_girl-2.6.0.gem b/vendor/cache/factory_girl-2.6.0.gem
diff --git a/vendor/cache/factory_girl-2.6.1.gem b/vendor/cache/factory_girl-2.6.1.gem
diff --git a/vendor/cache/rb-fsevent-0.9.0.gem b/vendor/cache/rb-fsevent-0.9.0.gem