Gemfile.lock now specifies compass version 0.11.7, otherwise "bundle exec compass compile" breaks. --- src/Gemfile.lock | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/src/Gemfile.lock b/src/Gemfile.lock index df278d9..d1e225c 100644 --- a/src/Gemfile.lock +++ b/src/Gemfile.lock @@ -46,7 +46,7 @@ GEM childprocess (0.3.2) ffi (~> 1.0.6) chunky_png (1.2.5) - compass (0.12.2) + compass (0.11.7) chunky_png (~> 1.2) fssm (>= 0.2.7) sass (~> 3.1) @@ -192,7 +192,7 @@ PLATFORMS DEPENDENCIES aeolus-image (>= 0.4.0) capybara - compass + compass (~> 0.11.7) compass-960-plugin cucumber cucumber-rails
On 25/07/12 10:36 -0700, Crag Wolfe wrote:
Gemfile.lock now specifies compass version 0.11.7, otherwise "bundle exec compass compile" breaks.
Ok, mostly ack, though minor fix needed, shown inline. I can ammend this locally, or you can resend, whichever you prefer.
src/Gemfile.lock | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/src/Gemfile.lock b/src/Gemfile.lock index df278d9..d1e225c 100644 --- a/src/Gemfile.lock +++ b/src/Gemfile.lock @@ -46,7 +46,7 @@ GEM childprocess (0.3.2) ffi (~> 1.0.6) chunky_png (1.2.5)
- compass (0.12.2)
- compass (0.11.7) chunky_png (~> 1.2) fssm (>= 0.2.7) sass (~> 3.1)
@@ -192,7 +192,7 @@ PLATFORMS DEPENDENCIES aeolus-image (>= 0.4.0) capybara
- compass
- compass (~> 0.11.7)
remove the above change, this should stay just 'compass' ^
compass-960-plugin cucumber cucumber-rails -- 1.7.1
Remove unnecessary line, only need to specify version in one place. --- src/Gemfile.lock | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-)
diff --git a/src/Gemfile.lock b/src/Gemfile.lock index df278d9..1e7de0c 100644 --- a/src/Gemfile.lock +++ b/src/Gemfile.lock @@ -46,7 +46,7 @@ GEM childprocess (0.3.2) ffi (~> 1.0.6) chunky_png (1.2.5) - compass (0.12.2) + compass (0.11.7) chunky_png (~> 1.2) fssm (>= 0.2.7) sass (~> 3.1)
On 25/07/12 11:22 -0700, Crag Wolfe wrote:
Remove unnecessary line, only need to specify version in one place.
Ok, I amended the previous patch to match this, then pushed. Sorry to not push as is, but your previous commit message was more accurate, so I did not want to use the new one.
-j
src/Gemfile.lock | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-)
diff --git a/src/Gemfile.lock b/src/Gemfile.lock index df278d9..1e7de0c 100644 --- a/src/Gemfile.lock +++ b/src/Gemfile.lock @@ -46,7 +46,7 @@ GEM childprocess (0.3.2) ffi (~> 1.0.6) chunky_png (1.2.5)
- compass (0.12.2)
- compass (0.11.7) chunky_png (~> 1.2) fssm (>= 0.2.7) sass (~> 3.1)
-- 1.7.1
aeolus-devel@lists.fedorahosted.org
-
cwolferh -
Jason Guiditta