Merge branch 'stable' of github.com:chriseppstein/compass

2011-04-28 09:06:34 -04:00 · 2011-04-28 09:06:34 -04:00 · c87b0fcd2d
commit c87b0fcd2d
parent 3376a38f9d 92a4a6522b
3 changed files with 9 additions and 4 deletions
--- a/.travis.yml
+++ b/.travis.yml
@ -0,0 +1,6 @@
+rvm:
+  - 1.8.7
+  - 1.9.2
+  - jruby
+  - rbx
+  - ree
--- a/2
+++ b/2
@ -7,7 +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"
+gem "sass", "~>3.1"
 gem "haml", "~> 3.1"
 gem "rcov"
 gem "rubyzip"
--- a/Gemfile.lock
+++ b/Gemfile.lock
@ -120,8 +120,7 @@ GEM
    ruby-json (1.1.2)
    ruby-prof (0.10.5)
    rubyzip (0.9.4)
-    sass (3.1.0)
-    sys-uname (0.8.5)
+    sass (3.1.1)
    term-ansicolor (1.0.5)
    thor (0.14.6)
    timecop (0.3.5)
@ -150,5 +149,5 @@ DEPENDENCIES
  rspec (~> 2.0.0)
  ruby-prof
  rubyzip
-  sass (= 3.1)
+  sass (~> 3.1)
  timecop