From 2cb7ae259f1496a82284586ad76144d95c6faf3d Mon Sep 17 00:00:00 2001 From: Larry Sprock Date: Sun, 24 Apr 2011 17:46:34 -0700 Subject: [PATCH] Remove unneeded code which was loading rake twice --- Rakefile | 7 ------- spec/spec_helper.rb | 2 +- 2 files changed, 1 insertion(+), 8 deletions(-) diff --git a/Rakefile b/Rakefile index 88734689..8cddc6c9 100644 --- a/Rakefile +++ b/Rakefile @@ -1,11 +1,4 @@ # encoding: UTF-8 -require 'rubygems' -begin - require 'bundler/setup' -rescue LoadError - puts 'You must `gem install bundler` and `bundle install` to run rake tasks' -end - require 'bundler' Bundler::GemHelper.install_tasks diff --git a/spec/spec_helper.rb b/spec/spec_helper.rb index e5a680fe..5a33ae8b 100644 --- a/spec/spec_helper.rb +++ b/spec/spec_helper.rb @@ -1,5 +1,5 @@ +require 'rubygems' require 'bundler/setup' -# require 'carrierwave' RSpec.configure do |c| c.mock_with :mocha