diff options
author | Aaron Patterson <aaron.patterson@gmail.com> | 2015-09-30 07:42:31 -0700 |
---|---|---|
committer | Aaron Patterson <aaron.patterson@gmail.com> | 2015-09-30 07:42:58 -0700 |
commit | ff30db1372f2d6c3ac47fe5b0ffb7ca21390f3c1 (patch) | |
tree | 6d726c73686300eab89b31c8943754a6f39a9d9b /Gemfile.lock | |
parent | 591a0bb87fff7583e01156696fbbf929d48d3e54 (diff) | |
download | rails-ff30db1372f2d6c3ac47fe5b0ffb7ca21390f3c1.tar.gz rails-ff30db1372f2d6c3ac47fe5b0ffb7ca21390f3c1.tar.bz2 rails-ff30db1372f2d6c3ac47fe5b0ffb7ca21390f3c1.zip |
run against edge sass to eliminate circular require warnings
Diffstat (limited to 'Gemfile.lock')
-rw-r--r-- | Gemfile.lock | 10 |
1 files changed, 8 insertions, 2 deletions
diff --git a/Gemfile.lock b/Gemfile.lock index e8b40c56e6..7d6db0474e 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -103,6 +103,13 @@ GIT specs: concurrent-ruby (1.0.0.pre3) +GIT + remote: git://github.com/sass/sass.git + revision: 4ef8e3167985ace91b2105916756bd93c5d7bba6 + branch: stable + specs: + sass (3.4.18) + PATH remote: . specs: @@ -256,7 +263,6 @@ GEM resque (~> 1.25) rufus-scheduler (~> 3.0) rufus-scheduler (3.1.4) - sass (3.4.18) sdoc (0.4.1) json (~> 1.7, >= 1.7.7) rdoc (~> 4.0) @@ -342,7 +348,7 @@ DEPENDENCIES redcarpet (~> 3.2.3) resque resque-scheduler - sass (>= 3.3) + sass! sass-rails! sdoc (~> 0.4.0) sequel |