Skip to content

Commit aa611cd

Browse files
committed
Merge branch 'master' of github.com:codecarrotnet/blog.codecarrot.net
2 parents 8cd42dd + 26704ea commit aa611cd

File tree

2 files changed

+44
-42
lines changed

2 files changed

+44
-42
lines changed

Gemfile

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -8,19 +8,19 @@ source "https://rubygems.org"
88
#
99
# This will help ensure the proper Jekyll version is running.
1010
# Happy Jekylling!
11-
gem "jekyll", "3.8"
11+
gem "jekyll", "3.8.5"
1212

1313
# This is the default theme for new Jekyll sites. You may change this to anything you like.
1414
gem "minima", "~> 2.0"
15-
gem 'jekyll-seo-tag', "~> 2.5.0"
15+
gem 'jekyll-seo-tag', "~> 2.6.1"
1616

1717
# If you want to use GitHub Pages, remove the "gem "jekyll"" above and
1818
# uncomment the line below. To upgrade, run `bundle update github-pages`.
1919
# gem "github-pages", group: :jekyll_plugins
2020

2121
# If you have any plugins, put them here!
2222
group :jekyll_plugins do
23-
gem "jekyll-feed", "~> 0.10.0"
23+
gem "jekyll-feed", "~> 0.12.1"
2424
gem "jekyll-paginate"
2525
gem 'jemoji'
2626
end

Gemfile.lock

Lines changed: 41 additions & 39 deletions
Original file line numberDiff line numberDiff line change
@@ -1,31 +1,31 @@
11
GEM
22
remote: https://rubygems.org/
33
specs:
4-
activesupport (5.2.0)
5-
concurrent-ruby (~> 1.0, >= 1.0.2)
6-
i18n (>= 0.7, < 2)
7-
minitest (~> 5.1)
8-
tzinfo (~> 1.1)
9-
addressable (2.5.2)
4+
activesupport (3.2.22.5)
5+
i18n (~> 0.6, >= 0.6.4)
6+
multi_json (~> 1.0)
7+
addressable (2.6.0)
108
public_suffix (>= 2.0.2, < 4.0)
119
colorator (1.1.0)
12-
concurrent-ruby (1.0.5)
10+
concurrent-ruby (1.1.5)
1311
em-websocket (0.5.1)
1412
eventmachine (>= 0.12.9)
1513
http_parser.rb (~> 0.6.0)
14+
eventmachine (1.2.7)
1615
eventmachine (1.2.7-x64-mingw32)
1716
eventmachine (1.2.7-x86-mingw32)
18-
ffi (1.9.25-x64-mingw32)
19-
ffi (1.9.25-x86-mingw32)
17+
ffi (1.11.1)
18+
ffi (1.11.1-x64-mingw32)
19+
ffi (1.11.1-x86-mingw32)
2020
forwardable-extended (2.6.0)
21-
gemoji (3.0.0)
22-
html-pipeline (2.8.4)
21+
gemoji (3.0.1)
22+
html-pipeline (2.11.0)
2323
activesupport (>= 2)
2424
nokogiri (>= 1.4)
2525
http_parser.rb (0.6.0)
2626
i18n (0.9.5)
2727
concurrent-ruby (~> 1.0)
28-
jekyll (3.8.0)
28+
jekyll (3.8.5)
2929
addressable (~> 2.4)
3030
colorator (~> 1.0)
3131
em-websocket (~> 0.5)
@@ -38,65 +38,67 @@ GEM
3838
pathutil (~> 0.9)
3939
rouge (>= 1.7, < 4)
4040
safe_yaml (~> 1.0)
41-
jekyll-feed (0.10.0)
42-
jekyll (~> 3.3)
41+
jekyll-feed (0.12.1)
42+
jekyll (>= 3.7, < 5.0)
4343
jekyll-paginate (1.1.0)
4444
jekyll-sass-converter (1.5.2)
4545
sass (~> 3.4)
46-
jekyll-seo-tag (2.5.0)
47-
jekyll (~> 3.3)
48-
jekyll-watch (2.0.0)
46+
jekyll-seo-tag (2.6.1)
47+
jekyll (>= 3.3, < 5.0)
48+
jekyll-watch (2.2.1)
4949
listen (~> 3.0)
50-
jemoji (0.10.0)
50+
jemoji (0.11.0)
5151
gemoji (~> 3.0)
5252
html-pipeline (~> 2.2)
53-
jekyll (~> 3.0)
53+
jekyll (>= 3.0, < 5.0)
5454
kramdown (1.17.0)
55-
liquid (4.0.0)
55+
liquid (4.0.3)
5656
listen (3.1.5)
5757
rb-fsevent (~> 0.9, >= 0.9.4)
5858
rb-inotify (~> 0.9, >= 0.9.7)
5959
ruby_dep (~> 1.2)
6060
mercenary (0.3.6)
61-
mini_portile2 (2.3.0)
61+
mini_portile2 (2.4.0)
6262
minima (2.5.0)
6363
jekyll (~> 3.5)
6464
jekyll-feed (~> 0.9)
6565
jekyll-seo-tag (~> 2.1)
66-
minitest (5.11.3)
67-
nokogiri (1.8.4-x64-mingw32)
68-
mini_portile2 (~> 2.3.0)
69-
nokogiri (1.8.4-x86-mingw32)
70-
mini_portile2 (~> 2.3.0)
71-
pathutil (0.16.1)
66+
multi_json (1.13.1)
67+
nokogiri (1.10.3)
68+
mini_portile2 (~> 2.4.0)
69+
nokogiri (1.10.3-x64-mingw32)
70+
mini_portile2 (~> 2.4.0)
71+
nokogiri (1.10.3-x86-mingw32)
72+
mini_portile2 (~> 2.4.0)
73+
pathutil (0.16.2)
7274
forwardable-extended (~> 2.6)
73-
public_suffix (3.0.2)
75+
public_suffix (3.1.0)
7476
rb-fsevent (0.10.3)
75-
rb-inotify (0.9.10)
76-
ffi (>= 0.5.0, < 2)
77-
rouge (3.1.1)
77+
rb-inotify (0.10.0)
78+
ffi (~> 1.0)
79+
rouge (3.3.0)
7880
ruby_dep (1.5.0)
79-
safe_yaml (1.0.4)
80-
sass (3.5.7)
81+
safe_yaml (1.0.5)
82+
sass (3.7.4)
8183
sass-listen (~> 4.0.0)
8284
sass-listen (4.0.0)
8385
rb-fsevent (~> 0.9, >= 0.9.4)
8486
rb-inotify (~> 0.9, >= 0.9.7)
85-
thread_safe (0.3.6)
86-
tzinfo (1.2.5)
87-
thread_safe (~> 0.1)
87+
tzinfo (2.0.0)
88+
concurrent-ruby (~> 1.0)
8889
tzinfo-data (1.2018.5)
8990
tzinfo (>= 1.0.0)
9091

9192
PLATFORMS
93+
ruby
9294
x64-mingw32
9395
x86-mingw32
9496

9597
DEPENDENCIES
96-
jekyll (= 3.8)
97-
jekyll-feed (~> 0.10.0)
98+
jekyll (= 3.8.5)
99+
jekyll-feed (~> 0.12.1)
98100
jekyll-paginate
99-
jekyll-seo-tag (~> 2.5.0)
101+
jekyll-seo-tag (~> 2.6.1)
100102
jemoji
101103
minima (~> 2.0)
102104
tzinfo-data

0 commit comments

Comments
 (0)