5
0
mirror of https://git.coop/cotech/website.git synced 2024-11-12 10:50:51 +00:00

Merge branch 'master' into dev

This commit is contained in:
Nick Sellen 2018-11-29 15:14:08 +00:00
commit 3b12a56f2d
3 changed files with 17 additions and 8 deletions

View File

@ -1,3 +1,6 @@
source 'https://rubygems.org' source 'https://rubygems.org'
gem 'jekyll' gem 'jekyll'
# Fixes deprecation warning - see https://github.com/jekyll/jekyll-sass-converter/pull/75
gem 'jekyll-sass-converter', git: 'https://github.com/jekyll/jekyll-sass-converter.git', branch: 'sassc'

View File

@ -1,3 +1,11 @@
GIT
remote: https://github.com/jekyll/jekyll-sass-converter.git
revision: c4d4e3e5b1a2222bb94895f9a6ab7e0216236ab8
branch: sassc
specs:
jekyll-sass-converter (1.5.2)
sassc (~> 2.0)
GEM GEM
remote: https://rubygems.org/ remote: https://rubygems.org/
specs: specs:
@ -27,8 +35,6 @@ GEM
pathutil (~> 0.9) pathutil (~> 0.9)
rouge (>= 1.7, < 4) rouge (>= 1.7, < 4)
safe_yaml (~> 1.0) safe_yaml (~> 1.0)
jekyll-sass-converter (1.5.2)
sass (~> 3.4)
jekyll-watch (2.1.2) jekyll-watch (2.1.2)
listen (~> 3.0) listen (~> 3.0)
kramdown (1.17.0) kramdown (1.17.0)
@ -41,23 +47,23 @@ GEM
pathutil (0.16.2) pathutil (0.16.2)
forwardable-extended (~> 2.6) forwardable-extended (~> 2.6)
public_suffix (2.0.5) public_suffix (2.0.5)
rake (12.3.1)
rb-fsevent (0.10.3) rb-fsevent (0.10.3)
rb-inotify (0.9.10) rb-inotify (0.9.10)
ffi (>= 0.5.0, < 2) ffi (>= 0.5.0, < 2)
rouge (2.2.1) rouge (2.2.1)
ruby_dep (1.5.0) ruby_dep (1.5.0)
safe_yaml (1.0.4) safe_yaml (1.0.4)
sass (3.6.0) sassc (2.0.0)
sass-listen (~> 4.0.0) ffi (~> 1.9.6)
sass-listen (4.0.0) rake
rb-fsevent (~> 0.9, >= 0.9.4)
rb-inotify (~> 0.9, >= 0.9.7)
PLATFORMS PLATFORMS
ruby ruby
DEPENDENCIES DEPENDENCIES
jekyll jekyll
jekyll-sass-converter!
BUNDLED WITH BUNDLED WITH
1.17.1 1.17.1