8000 Merge pull request #617 from charafau/upgrade_jekyll · codeZeilen/scala.github.com@19478a0 · GitHub
[go: up one dir, main page]
Skip to content
8000

Commit 19478a0

Browse files
SethTisueSethTisue
authored
Merge pull request scala#617 from charafau/upgrade_jekyll
Upgraded jekyll to 3.3.0 using bundle update
2 parents b5053c2 + 794ae43 commit 19478a0

File tree

2 files changed

+26
-20
lines changed

2 files changed

+26
-20
lines changed

‎.bundle/config‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,3 @@
11
---
2-
BUNDLE_PATH: vendor/bundle
3-
BUNDLE_DISABLE_SHARED_GEMS: true
2+
BUNDLE_PATH: "vendor/bundle"
3+
BUNDLE_DISABLE_SHARED_GEMS: "true"

‎Gemfile.lock‎

Lines changed: 24 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -21,27 +21,28 @@ GEM
2121
ffi (1.9.14)
2222
forwardable-extended (2.6.0)
2323
gemoji (2.1.0)
24-
github-pages (98)
24+
github-pages (104)
2525
activesupport (= 4.2.7)
2626
github-pages-health-check (= 1.2.0)
27-
jekyll (= 3.2.1)
27+
jekyll (= 3.3.0)
28+
jekyll-avatar (= 0.4.2)
2829
jekyll-coffeescript (= 1.0.1)
29-
jekyll-feed (= 0.5.1)
30+
jekyll-feed (= 0.8.0)
3031
jekyll-gist (= 1.4.0)
31-
jekyll-github-metadata (= 2.1.1)
32+
jekyll-github-metadata (= 2.2.0)
3233
jekyll-mentions (= 1.2.0)
33 8000 34
jekyll-paginate (= 1.1.0)
3435
jekyll-redirect-from (= 0.11.0)
3536
jekyll-sass-converter (= 1.3.0)
36-
jekyll-seo-tag (= 2.0.0)
37-
jekyll-sitemap (= 0.10.0)
37+
jekyll-seo-tag (= 2.1.0)
38+
jekyll-sitemap (= 0.12.0)
3839
jekyll-swiss (= 0.4.0)
3940
jemoji (= 0.7.0)
4041
kramdown (= 1.11.1)
4142
liquid (= 3.0.6)
4243
listen (= 3.0.6)
4344
mercenary (~> 0.3)
44-
minima (= 1.2.0)
45+
minima (= 2.0.0)
4546
rouge (= 1.11.1)
4647
terminal-table (~> 1.4)
4748
github-pages-health-check (1.2.0)
@@ -54,7 +55,8 @@ GEM
5455
activesupport (>= 2)
5556
nokogiri (>= 1.4)
5657
i18n (0.7.0)
57-
jekyll (3.2.1)
58+
jekyll (3.3.0)
59+
addressable (~> 2.4)
5860
colorator (~> 1.0)
5961
jekyll-sass-converter (~> 1.0)
6062
jekyll-watch (~> 1.1)
@@ -64,14 +66,17 @@ GEM
6466
pathutil (~> 0.9)
6567
rouge (~> 1.7)
6668
safe_yaml (~> 1.0)
69+
jekyll-avatar (0.4.2)
70+
jekyll (~> 3.0)
6771
jekyll-coffeescript (1.0.1)
6872
coffee-script (~> 2.2)
69-
jekyll-feed (0.5.1)
73+
jekyll-feed (0.8.0)
74+
jekyll (~> 3.3)
7075
jekyll-gist (1.4.0)
7176
octokit (~> 4.2)
72-
jekyll-github-metadata (2.1.1)
77+
jekyll-github-metadata (2.2.0)
7378
jekyll (~> 3.1)
74-
octokit (~> 4.0)
79+
octokit (~> 4.0, != 4.4.0)
7580
jekyll-mentions (1.2.0)
7681
activesupport (~> 4.0)
7782
html-pipeline (~> 2.3)
@@ -81,9 +86,10 @@ GEM
8186
jekyll (>= 2.0)
8287
jekyll-sass-converter (1.3.0)
8388
sass (~> 3.2)
84-
jekyll-seo-tag (2.0.0)
85-
jekyll (~> 3.1)
86-
jekyll-sitemap (0.10.0)
89+
jekyll-seo-tag (2.1.0)
90+
jekyll (~> 3.3)
91+
jekyll-sitemap (0.12.0)
92+
jekyll (~> 3.3)
8793
jekyll-swiss (0.4.0)
8894
jekyll-watch (1.5.0)
8995
listen (~> 3.0, < 3.1)
@@ -100,18 +106,18 @@ GEM
100106
rb-inotify (>= 0.9.7)
101107
mercenary (0.3.6)
102108
mini_portile2 (2.1.0)
103-
minima (1.2.0)
109+
minima (2.0.0)
104110
minitest (5.9.1)
105111
multipart-post (2.0.0)
106112
net-dns (0.8.0)
107113
nokogiri (1.6.8.1)
108114
mini_portile2 (~> 2.1.0)
109-
octokit (4.3.0)
115+
octokit (4.4.1)
110116
sawyer (~> 0.7.0, >= 0.5.3)
111117
pathutil (0.14.0)
112118
forwardable-extended (~> 2.6)
113119
public_suffix (1.5.3)
114-
rb-fsevent (0.9.7)
120+
rb-fsevent (0.9.8)
115121
rb-inotify (0.9.7)
116122
ffi (>= 0.5.0)
117123
rouge (1.11.1)
@@ -136,4 +142,4 @@ DEPENDENCIES
136142
github-pages
137143

138144
BUNDLED WITH
139-
1.12.5
145+
1.13.6

0 commit comments

Comments
 (0)
0