Skip to content

Commit dc771a3

Browse files
committed
Merge branch 'master' of github.com:shellscape/shellscape.github.io
2 parents 8d40269 + ccc76ff commit dc771a3

2 files changed

Lines changed: 35 additions & 23 deletions

File tree

Gemfile

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
source 'https://rubygems.org'
2-
gem 'jekyll'
3-
gem 'jekyll-sitemap'
4-
gem 'jekyll-feed'
2+
gem 'jekyll', '>= 3.6.2'
3+
gem 'jekyll-sitemap', '>= 1.1.1'
4+
gem 'jekyll-feed', '>= 0.9.2'
55
gem "jekyll-gist"

Gemfile.lock

Lines changed: 32 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -4,49 +4,61 @@ GEM
44
addressable (2.5.2)
55
public_suffix (>= 2.0.2, < 4.0)
66
colorator (1.1.0)
7+
concurrent-ruby (1.0.5)
8+
em-websocket (0.5.1)
9+
eventmachine (>= 0.12.9)
10+
http_parser.rb (~> 0.6.0)
11+
eventmachine (1.2.7)
712
faraday (0.13.1)
813
multipart-post (>= 1.2, < 3)
9-
ffi (1.9.18)
14+
ffi (1.9.25)
1015
forwardable-extended (2.6.0)
11-
jekyll (3.6.2)
16+
http_parser.rb (0.6.0)
17+
i18n (0.9.5)
18+
concurrent-ruby (~> 1.0)
19+
jekyll (3.8.4)
1220
addressable (~> 2.4)
1321
colorator (~> 1.0)
22+
em-websocket (~> 0.5)
23+
i18n (~> 0.7)
1424
jekyll-sass-converter (~> 1.0)
15-
jekyll-watch (~> 1.1)
25+
jekyll-watch (~> 2.0)
1626
kramdown (~> 1.14)
1727
liquid (~> 4.0)
1828
mercenary (~> 0.3.3)
1929
pathutil (~> 0.9)
20-
rouge (>= 1.7, < 3)
30+
rouge (>= 1.7, < 4)
2131
safe_yaml (~> 1.0)
22-
jekyll-feed (0.9.2)
32+
jekyll-feed (0.11.0)
2333
jekyll (~> 3.3)
2434
jekyll-gist (1.4.1)
2535
octokit (~> 4.2)
26-
jekyll-sass-converter (1.5.0)
36+
jekyll-sass-converter (1.5.2)
2737
sass (~> 3.4)
28-
jekyll-sitemap (1.1.1)
38+
jekyll-sitemap (1.2.0)
2939
jekyll (~> 3.3)
30-
jekyll-watch (1.5.0)
31-
listen (~> 3.0, < 3.1)
32-
kramdown (1.15.0)
40+
jekyll-watch (2.0.0)
41+
listen (~> 3.0)
42+
kramdown (1.17.0)
3343
liquid (4.0.0)
34-
listen (3.0.8)
44+
listen (3.1.5)
3545
rb-fsevent (~> 0.9, >= 0.9.4)
3646
rb-inotify (~> 0.9, >= 0.9.7)
47+
ruby_dep (~> 1.2)
3748
mercenary (0.3.6)
3849
multipart-post (2.0.0)
3950
octokit (4.7.0)
4051
sawyer (~> 0.8.0, >= 0.5.3)
41-
pathutil (0.16.0)
52+
pathutil (0.16.1)
4253
forwardable-extended (~> 2.6)
43-
public_suffix (3.0.0)
44-
rb-fsevent (0.10.2)
54+
public_suffix (3.0.3)
55+
rb-fsevent (0.10.3)
4556
rb-inotify (0.9.10)
4657
ffi (>= 0.5.0, < 2)
47-
rouge (2.2.1)
58+
rouge (3.3.0)
59+
ruby_dep (1.5.0)
4860
safe_yaml (1.0.4)
49-
sass (3.5.3)
61+
sass (3.6.0)
5062
sass-listen (~> 4.0.0)
5163
sass-listen (4.0.0)
5264
rb-fsevent (~> 0.9, >= 0.9.4)
@@ -59,10 +71,10 @@ PLATFORMS
5971
ruby
6072

6173
DEPENDENCIES
62-
jekyll
63-
jekyll-feed
74+
jekyll (>= 3.6.2)
75+
jekyll-feed (>= 0.9.2)
6476
jekyll-gist
65-
jekyll-sitemap
77+
jekyll-sitemap (>= 1.1.1)
6678

6779
BUNDLED WITH
68-
1.16.0
80+
1.16.5

0 commit comments

Comments
 (0)