diff --git a/Gemfile b/Gemfile index d7b8fe661d03..ed3cd796f0c7 100644 --- a/Gemfile +++ b/Gemfile @@ -5,7 +5,7 @@ ruby "> 2.3.0" group :development do gem 'rake', '~> 10.0' gem 'jekyll', '~> 3.0' - gem 'compass', '~> 0.12' + gem 'compass', '~> 1.0' gem 'sass-globbing', '~> 1.0' gem 'stringex', '~> 1.4' gem 'pry' diff --git a/Gemfile.lock b/Gemfile.lock index 9b9a87a02c02..77c3609cddbc 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -3,16 +3,23 @@ GEM specs: addressable (2.5.2) public_suffix (>= 2.0.2, < 4.0) - chunky_png (1.3.8) + 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) ffi (1.9.18) forwardable-extended (2.6.0) - fssm (0.2.10) jekyll (3.5.2) addressable (~> 2.4) colorator (~> 1.0) @@ -42,6 +49,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) @@ -78,7 +86,7 @@ GEM redcarpet (3.4.0) rouge (1.11.1) safe_yaml (1.0.4) - sass (3.2.19) + sass (3.4.25) sass-globbing (1.1.5) sass (>= 3.1) sinatra (1.4.8) @@ -94,7 +102,7 @@ PLATFORMS ruby DEPENDENCIES - compass (~> 0.12) + compass (~> 1.0) jekyll (~> 3.0) jekyll-paginate jekyll-redirect-from