From 5cdd9c6d09130e61df19af2aacb391440e851f40 Mon Sep 17 00:00:00 2001 From: Scott Davis Date: Tue, 26 Apr 2011 21:52:47 -0400 Subject: [PATCH 1/3] updated gemfile --- Gemfile | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/Gemfile b/Gemfile index b102fdf4..e37b4129 100644 --- a/Gemfile +++ b/Gemfile @@ -7,8 +7,7 @@ gem "rspec", "~>2.0.0" gem "rails", "~>3.0.0.rc" gem "compass-validator", "3.0.0" gem "css_parser", "~> 1.0.1" -gem "sass", "3.1.0.alpha.263" -gem "haml", "~> 3.1.0.alpha" +#gem "sass", "~> 3.1.1" gem "rcov" gem "rubyzip" gem "livereload" From e78ddf5d72caa9f4f0bf522125050660151f233e Mon Sep 17 00:00:00 2001 From: Scott Davis Date: Tue, 26 Apr 2011 21:59:20 -0400 Subject: [PATCH 2/3] updated gemfile --- Gemfile | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Gemfile b/Gemfile index e37b4129..d419b455 100644 --- a/Gemfile +++ b/Gemfile @@ -11,13 +11,13 @@ gem "css_parser", "~> 1.0.1" gem "rcov" gem "rubyzip" gem "livereload" -gem "rb-fsevent" +gem "rb-fsevent" if RUBY_PLATFORM ~= /darwin/ gem "ruby-prof" unless RUBY_PLATFORM == "java" gem 'autotest' -gem 'autotest-fsevent' +gem 'autotest-fsevent' if RUBY_PLATFORM ~= /darwin/ gem 'fakefs', :git => 'git://github.com/johnbintz/fakefs.git' gem 'mocha' gem 'timecop' From f1061c474b59b5dafdbe402196071c31e32bef04 Mon Sep 17 00:00:00 2001 From: Scott Davis Date: Tue, 26 Apr 2011 22:00:46 -0400 Subject: [PATCH 3/3] updated gemfile --- Gemfile | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Gemfile b/Gemfile index d419b455..23e3b6d6 100644 --- a/Gemfile +++ b/Gemfile @@ -11,13 +11,13 @@ gem "css_parser", "~> 1.0.1" gem "rcov" gem "rubyzip" gem "livereload" -gem "rb-fsevent" if RUBY_PLATFORM ~= /darwin/ +gem "rb-fsevent" if RUBY_PLATFORM =~ /darwin/ gem "ruby-prof" unless RUBY_PLATFORM == "java" gem 'autotest' -gem 'autotest-fsevent' if RUBY_PLATFORM ~= /darwin/ +gem 'autotest-fsevent' if RUBY_PLATFORM =~ /darwin/ gem 'fakefs', :git => 'git://github.com/johnbintz/fakefs.git' gem 'mocha' gem 'timecop'