aboutsummaryrefslogtreecommitdiffstats
path: root/Gemfile.lock
diff options
context:
space:
mode:
authorMark Longair <mhl@pobox.com>2013-09-26 15:50:55 +0100
committerMark Longair <mhl@pobox.com>2013-09-30 10:34:36 +0100
commit091cb7ab80ceddca8de787b73afd037fe72a41f0 (patch)
treefe4756d731bceef214e3b3529d541c407f7db348 /Gemfile.lock
parent2da3d62c10d830f9e9a2270a6412f892122c7436 (diff)
WiP: also move admin CSS and images into the asset pipeline
We no longer need to run compass to regenerate the admin CSS - it will be done automatically.
Diffstat (limited to 'Gemfile.lock')
-rw-r--r--Gemfile.lock4
1 files changed, 3 insertions, 1 deletions
diff --git a/Gemfile.lock b/Gemfile.lock
index 554c0dd86..c3fdd40da 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -73,6 +73,8 @@ GEM
chunky_png (~> 1.2)
fssm (>= 0.2.7)
sass (~> 3.1)
+ compass-rails (1.0.3)
+ compass (>= 0.12.2, < 0.14)
coveralls (0.6.7)
colorize
multi_json (~> 1.3)
@@ -279,7 +281,7 @@ DEPENDENCIES
capistrano
charlock_holmes
coffee-rails (~> 3.1)
- compass
+ compass-rails
coveralls
debugger
dynamic_form