diff --git a/Gemfile b/Gemfile index a1d627a356aa..93e5e2750577 100644 --- a/Gemfile +++ b/Gemfile @@ -7,7 +7,7 @@ group :development do gem 'rdiscount', '~> 2.0' gem 'RedCloth', '~> 4.2' gem 'haml', '~> 4.0' - gem 'compass', '~> 0.12' + gem 'compass', '~> 1.0' gem 'sass-globbing', '~> 1.0' gem 'rubypants', '~> 0.2' gem 'rb-fsevent', '~> 0.9' diff --git a/Gemfile.lock b/Gemfile.lock index a64797568a6c..8280300d59bc 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -3,17 +3,24 @@ GEM specs: RedCloth (4.3.2) addressable (2.4.0) - chunky_png (1.3.6) + chunky_png (1.4.0) coderay (1.1.1) colorator (1.1.0) - compass (0.12.7) + compass (1.0.3) chunky_png (~> 1.2) - fssm (>= 0.2.7) - sass (~> 3.2.19) + compass-core (~> 1.0.2) + compass-import-once (~> 1.0.5) + rb-fsevent (>= 0.9.3) + rb-inotify (>= 0.9) + sass (>= 3.3.13, < 3.5) + compass-core (1.0.3) + multi_json (~> 1.0) + sass (>= 3.3.0, < 3.5) + compass-import-once (1.0.5) + sass (>= 3.2, < 3.5) execjs (2.7.0) ffi (1.9.14) forwardable-extended (2.6.0) - fssm (0.2.10) haml (4.0.7) tilt jekyll (3.2.1) @@ -45,6 +52,7 @@ GEM rb-inotify (~> 0.9, >= 0.9.7) mercenary (0.3.6) method_source (0.8.2) + multi_json (1.15.0) octopress (3.0.11) jekyll (>= 2.0) mercenary (~> 0.3.2) @@ -93,7 +101,7 @@ GEM rubypants (0.5.0) rubypants-unicode (0.2.5) safe_yaml (1.0.4) - sass (3.2.19) + sass (3.4.25) sass-globbing (1.1.5) sass (>= 3.1) sinatra (1.4.7) @@ -115,7 +123,7 @@ PLATFORMS DEPENDENCIES RedCloth (~> 4.2) coderay - compass (~> 0.12) + compass (~> 1.0) execjs haml (~> 4.0) jekyll (~> 3.0)