Skip to content

Commit

Permalink
Upgrade Jekyll
Browse files Browse the repository at this point in the history
  • Loading branch information
michaelklishin committed May 4, 2014
1 parent 1145ef5 commit c456e93
Show file tree
Hide file tree
Showing 2 changed files with 51 additions and 20 deletions.
2 changes: 1 addition & 1 deletion Gemfile
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
source "https://rubygems.org"

gem "jekyll", "~> 1.2.1"
gem "jekyll", "~> 2.0.0.rc1"
gem "redcarpet"
# with Ruby 2.0 on OS X, you may need to install
# it manually with --with-iconv-dir:
Expand Down
69 changes: 50 additions & 19 deletions Gemfile.lock
Original file line number Diff line number Diff line change
@@ -1,39 +1,70 @@
GEM
remote: https://rubygems.org/
specs:
classifier (1.3.3)
blankslate (2.1.2.4)
celluloid (0.15.2)
timers (~> 1.1.0)
celluloid-io (0.15.0)
celluloid (>= 0.15.0)
nio4r (>= 0.5.0)
classifier (1.3.4)
fast-stemmer (>= 1.0.0)
coffee-script (2.2.0)
coffee-script-source
execjs
coffee-script-source (1.7.0)
colorator (0.1)
commander (4.1.5)
highline (~> 1.6.11)
directory_watcher (1.4.1)
execjs (2.0.2)
fast-stemmer (1.0.2)
highline (1.6.20)
iconv (1.0.3)
jekyll (1.2.1)
ffi (1.9.3)
iconv (1.0.4)
jekyll (2.0.0.rc1)
classifier (~> 1.3)
colorator (~> 0.1)
commander (~> 4.1.3)
directory_watcher (~> 1.4.1)
liquid (~> 2.5.2)
maruku (~> 0.5)
jekyll-coffeescript (~> 1.0)
jekyll-sass-converter (~> 1.0.0.rc3)
liquid (~> 2.5.5)
listen (~> 2.5)
maruku (= 0.7.0)
mercenary (~> 0.3.1)
pygments.rb (~> 0.5.0)
redcarpet (~> 2.3.0)
safe_yaml (~> 0.7.0)
liquid (2.5.3)
redcarpet (~> 3.1)
safe_yaml (~> 1.0)
toml (~> 0.1.0)
jekyll-coffeescript (1.0.0)
coffee-script (~> 2.2)
jekyll-sass-converter (1.0.0.rc4)
sass (~> 3.2)
liquid (2.5.5)
listen (2.7.4)
celluloid (>= 0.15.2)
celluloid-io (>= 0.15.0)
rb-fsevent (>= 0.9.3)
rb-inotify (>= 0.9)
maruku (0.7.0)
posix-spawn (0.3.6)
pygments.rb (0.5.2)
mercenary (0.3.2)
nio4r (1.0.0)
parslet (1.5.0)
blankslate (~> 2.0)
posix-spawn (0.3.8)
pygments.rb (0.5.4)
posix-spawn (~> 0.3.6)
yajl-ruby (~> 1.1.0)
redcarpet (2.3.0)
safe_yaml (0.7.1)
rb-fsevent (0.9.4)
rb-inotify (0.9.4)
ffi (>= 0.5.0)
redcarpet (3.1.1)
safe_yaml (1.0.3)
sass (3.3.7)
timers (1.1.0)
toml (0.1.1)
parslet (~> 1.5.0)
yajl-ruby (1.1.0)

PLATFORMS
ruby

DEPENDENCIES
iconv
jekyll (~> 1.2.1)
jekyll (~> 2.0.0.rc1)
redcarpet

0 comments on commit c456e93

Please sign in to comment.