Skip to content

Commit 9d30ab2

Browse files
committed
Merge pull request t413#55 from kendaleiv/upgrades
Upgrade gems including Jekyll
2 parents f0977ce + 3265f0b commit 9d30ab2

File tree

4 files changed

+83
-82
lines changed

4 files changed

+83
-82
lines changed

Gemfile

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,4 +2,5 @@ source 'https://rubygems.org'
22

33
gem 'execjs'
44
gem 'therubyracer'
5-
gem 'github-pages'
5+
gem 'github-pages'
6+
gem 'jekyll-paginate'

Gemfile.lock

Lines changed: 72 additions & 75 deletions
Original file line numberDiff line numberDiff line change
@@ -1,136 +1,133 @@
11
GEM
22
remote: https://rubygems.org/
33
specs:
4-
RedCloth (4.2.9)
5-
activesupport (4.2.4)
4+
activesupport (4.2.6)
65
i18n (~> 0.7)
76
json (~> 1.7, >= 1.7.7)
87
minitest (~> 5.1)
98
thread_safe (~> 0.3, >= 0.3.4)
109
tzinfo (~> 1.1)
11-
addressable (2.3.8)
12-
blankslate (2.1.2.4)
13-
classifier-reborn (2.0.4)
14-
fast-stemmer (~> 1.0)
10+
addressable (2.4.0)
1511
coffee-script (2.4.1)
1612
coffee-script-source
1713
execjs
18-
coffee-script-source (1.9.1.1)
14+
coffee-script-source (1.10.0)
1915
colorator (0.1)
20-
ethon (0.8.0)
16+
ethon (0.9.0)
2117
ffi (>= 1.3.0)
2218
execjs (2.6.0)
23-
fast-stemmer (1.0.2)
19+
faraday (0.9.2)
20+
multipart-post (>= 1.2, < 3)
2421
ffi (1.9.10)
2522
gemoji (2.1.0)
26-
github-pages (39)
27-
RedCloth (= 4.2.9)
28-
github-pages-health-check (~> 0.2)
29-
jekyll (= 2.4.0)
23+
github-pages (78)
24+
github-pages-health-check (= 1.1.0)
25+
jekyll (= 3.0.5)
3026
jekyll-coffeescript (= 1.0.1)
31-
jekyll-feed (= 0.3.1)
32-
jekyll-mentions (= 0.2.1)
33-
jekyll-redirect-from (= 0.8.0)
27+
jekyll-feed (= 0.5.1)
28+
jekyll-gist (= 1.4.0)
29+
jekyll-github-metadata (= 1.11.1)
30+
jekyll-mentions (= 1.1.2)
31+
jekyll-paginate (= 1.1.0)
32+
jekyll-redirect-from (= 0.10.0)
3433
jekyll-sass-converter (= 1.3.0)
35-
jekyll-sitemap (= 0.8.1)
36-
jemoji (= 0.5.0)
37-
kramdown (= 1.5.0)
38-
liquid (= 2.6.2)
39-
maruku (= 0.7.0)
34+
jekyll-seo-tag (= 1.4.0)
35+
jekyll-sitemap (= 0.10.0)
36+
jemoji (= 0.6.2)
37+
kramdown (= 1.10.0)
38+
liquid (= 3.0.6)
39+
listen (= 3.0.6)
4040
mercenary (~> 0.3)
41-
pygments.rb (= 0.6.3)
42-
rdiscount (= 2.1.7)
43-
redcarpet (= 3.3.2)
41+
rouge (= 1.10.1)
4442
terminal-table (~> 1.4)
45-
github-pages-health-check (0.5.3)
43+
github-pages-health-check (1.1.0)
4644
addressable (~> 2.3)
4745
net-dns (~> 0.8)
46+
octokit (~> 4.0)
4847
public_suffix (~> 1.4)
4948
typhoeus (~> 0.7)
50-
html-pipeline (1.9.0)
51-
activesupport (>= 2)
52-
nokogiri (~> 1.4)
49+
html-pipeline (2.4.1)
50+
activesupport (>= 2, < 5)
51+
nokogiri (>= 1.4)
5352
i18n (0.7.0)
54-
jekyll (2.4.0)
55-
classifier-reborn (~> 2.0)
53+
jekyll (3.0.5)
5654
colorator (~> 0.1)
57-
jekyll-coffeescript (~> 1.0)
58-
jekyll-gist (~> 1.0)
59-
jekyll-paginate (~> 1.0)
6055
jekyll-sass-converter (~> 1.0)
6156
jekyll-watch (~> 1.1)
6257
kramdown (~> 1.3)
63-
liquid (~> 2.6.1)
58+
liquid (~> 3.0)
6459
mercenary (~> 0.3.3)
65-
pygments.rb (~> 0.6.0)
66-
redcarpet (~> 3.1)
60+
rouge (~> 1.7)
6761
safe_yaml (~> 1.0)
68-
toml (~> 0.1.0)
6962
jekyll-coffeescript (1.0.1)
7063
coffee-script (~> 2.2)
71-
jekyll-feed (0.3.1)
72-
jekyll-gist (1.3.5)
73-
jekyll-mentions (0.2.1)
74-
html-pipeline (~> 1.9.0)
75-
jekyll (~> 2.0)
64+
jekyll-feed (0.5.1)
65+
jekyll-gist (1.4.0)
66+
octokit (~> 4.2)
67+
jekyll-github-metadata (1.11.1)
68+
octokit (~> 4.0)
69+
jekyll-mentions (1.1.2)
70+
html-pipeline (~> 2.3)
71+
jekyll (~> 3.0)
7672
jekyll-paginate (1.1.0)
77-
jekyll-redirect-from (0.8.0)
73+
jekyll-redirect-from (0.10.0)
7874
jekyll (>= 2.0)
7975
jekyll-sass-converter (1.3.0)
8076
sass (~> 3.2)
81-
jekyll-sitemap (0.8.1)
82-
jekyll-watch (1.3.0)
83-
listen (~> 3.0)
84-
jemoji (0.5.0)
77+
jekyll-seo-tag (1.4.0)
78+
jekyll (~> 3.0)
79+
jekyll-sitemap (0.10.0)
80+
jekyll-watch (1.4.0)
81+
listen (~> 3.0, < 3.1)
82+
jemoji (0.6.2)
8583
gemoji (~> 2.0)
86-
html-pipeline (~> 1.9)
87-
jekyll (>= 2.0)
84+
html-pipeline (~> 2.2)
85+
jekyll (>= 3.0)
8886
json (1.8.3)
89-
kramdown (1.5.0)
90-
libv8 (3.16.14.13)
91-
liquid (2.6.2)
92-
listen (3.0.4)
87+
kramdown (1.10.0)
88+
libv8 (3.16.14.15)
89+
liquid (3.0.6)
90+
listen (3.0.6)
9391
rb-fsevent (>= 0.9.3)
94-
rb-inotify (>= 0.9)
95-
maruku (0.7.0)
96-
mercenary (0.3.5)
97-
mini_portile (0.6.2)
98-
minitest (5.8.2)
92+
rb-inotify (>= 0.9.7)
93+
mercenary (0.3.6)
94+
mini_portile2 (2.0.0)
95+
minitest (5.8.4)
96+
multipart-post (2.0.0)
9997
net-dns (0.8.0)
100-
nokogiri (1.6.6.2)
101-
mini_portile (~> 0.6.0)
102-
parslet (1.5.0)
103-
blankslate (~> 2.0)
104-
posix-spawn (0.3.11)
105-
public_suffix (1.5.2)
106-
pygments.rb (0.6.3)
107-
posix-spawn (~> 0.3.6)
108-
yajl-ruby (~> 1.2.0)
109-
rb-fsevent (0.9.6)
110-
rb-inotify (0.9.5)
98+
nokogiri (1.6.7.2)
99+
mini_portile2 (~> 2.0.0.rc2)
100+
octokit (4.3.0)
101+
sawyer (~> 0.7.0, >= 0.5.3)
102+
public_suffix (1.5.3)
103+
rb-fsevent (0.9.7)
104+
rb-inotify (0.9.7)
111105
ffi (>= 0.5.0)
112-
rdiscount (2.1.7)
113-
redcarpet (3.3.2)
114106
ref (2.0.0)
107+
rouge (1.10.1)
115108
safe_yaml (1.0.4)
116-
sass (3.4.19)
109+
sass (3.4.22)
110+
sawyer (0.7.0)
111+
addressable (>= 2.3.5, < 2.5)
112+
faraday (~> 0.8, < 0.10)
117113
terminal-table (1.5.2)
118114
therubyracer (0.12.2)
119115
libv8 (~> 3.16.14.0)
120116
ref
121117
thread_safe (0.3.5)
122-
toml (0.1.2)
123-
parslet (~> 1.5.0)
124118
typhoeus (0.8.0)
125119
ethon (>= 0.8.0)
126120
tzinfo (1.2.2)
127121
thread_safe (~> 0.1)
128-
yajl-ruby (1.2.1)
129122

130123
PLATFORMS
131124
ruby
132125

133126
DEPENDENCIES
134127
execjs
135128
github-pages
129+
jekyll-paginate
136130
therubyracer
131+
132+
BUNDLED WITH
133+
1.12.3

Vagrantfile

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -12,11 +12,11 @@ $script_provision = <<SCRIPT
1212
cd /vagrant
1313
bundle install
1414
15-
echo "#!/bin/bash" > /usr/local/bin/jekyll-start.sh
16-
echo "cd /vagrant" >> /usr/local/bin/jekyll-start.sh
17-
echo "source /usr/local/rvm/scripts/rvm" >> /usr/local/bin/jekyll-start.sh
18-
echo "bundle exec jekyll serve --force_polling" >> /usr/local/bin/jekyll-start.sh
19-
chmod +x /usr/local/bin/jekyll-start.sh
15+
echo "#!/bin/bash" > /usr/local/bin/jekyll-start.sh
16+
echo "cd /vagrant" >> /usr/local/bin/jekyll-start.sh
17+
echo "source /usr/local/rvm/scripts/rvm" >> /usr/local/bin/jekyll-start.sh
18+
echo "bundle exec jekyll serve --force_polling --host 0.0.0.0" >> /usr/local/bin/jekyll-start.sh
19+
chmod +x /usr/local/bin/jekyll-start.sh
2020
2121
echo Provisioned!!!
2222
SCRIPT

_config.yml

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -147,6 +147,9 @@ prose:
147147
element: "checkbox"
148148
label: "Publish"
149149
help: "Check to publish post, uncheck to hide."
150-
150+
151+
gems:
152+
- jekyll-paginate
153+
151154
# Beautiful Jekyll / Dean Attali
152155
# 2fc73a3a967e97599c9763d05e564189

0 commit comments

Comments
 (0)