Skip to content

Commit cfdb0c8

Browse files
committed
Big fat dependencies update (plus Ruby up to 2.5.3)
1 parent 97d07b1 commit cfdb0c8

File tree

3 files changed

+48
-46
lines changed

3 files changed

+48
-46
lines changed

.gitignore

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -15,3 +15,5 @@
1515

1616
# Ignore Bower Folder
1717
/bower_components
18+
19+
/node_modules

.ruby-version

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
ruby-2.3.1
1+
2.5.3

Gemfile.lock

Lines changed: 45 additions & 45 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,8 @@
11
GEM
22
remote: http://rubygems.org/
33
specs:
4-
activesupport (4.2.6)
4+
activesupport (4.2.11)
55
i18n (~> 0.7)
6-
json (~> 1.7, >= 1.7.7)
76
minitest (~> 5.1)
87
thread_safe (~> 0.3, >= 0.3.4)
98
tzinfo (~> 1.1)
@@ -16,11 +15,11 @@ GEM
1615
rack (>= 1.0.0)
1716
rack-test (>= 0.5.4)
1817
xpath (~> 2.0)
19-
chunky_png (1.3.5)
18+
chunky_png (1.3.11)
2019
coffee-script (2.4.1)
2120
coffee-script-source
2221
execjs
23-
coffee-script-source (1.10.0)
22+
coffee-script-source (1.12.2)
2423
compass (1.0.3)
2524
chunky_png (~> 1.2)
2625
compass-core (~> 1.0.2)
@@ -33,29 +32,30 @@ GEM
3332
sass (>= 3.3.0, < 3.5)
3433
compass-import-once (1.0.5)
3534
sass (>= 3.2, < 3.5)
36-
docile (1.1.5)
35+
docile (1.3.1)
3736
em-websocket (0.5.1)
3837
eventmachine (>= 0.12.9)
3938
http_parser.rb (~> 0.6.0)
4039
erubis (2.7.0)
41-
eventmachine (1.2.0.1)
42-
execjs (2.6.0)
40+
eventmachine (1.2.7)
41+
execjs (2.7.0)
4342
favicon_maker (1.3.1)
4443
docile (~> 1.1)
45-
ffi (1.9.10)
46-
haml (4.0.7)
44+
ffi (1.9.25)
45+
haml (5.0.4)
46+
temple (>= 0.8.0)
4747
tilt
4848
hike (1.2.3)
4949
hooks (0.4.1)
5050
uber (~> 0.0.14)
5151
htmlcompressor (0.2.0)
5252
http_parser.rb (0.6.0)
5353
i18n (0.7.0)
54-
json (1.8.3)
55-
kramdown (1.10.0)
56-
listen (3.0.6)
57-
rb-fsevent (>= 0.9.3)
58-
rb-inotify (>= 0.9.7)
54+
json (2.1.0)
55+
kramdown (1.17.0)
56+
listen (3.0.8)
57+
rb-fsevent (~> 0.9, >= 0.9.4)
58+
rb-inotify (~> 0.9, >= 0.9.7)
5959
middleman (3.4.1)
6060
coffee-script (~> 2.2)
6161
compass (>= 1.0.0, < 2.0.0)
@@ -102,42 +102,42 @@ GEM
102102
middleman-core (>= 3.2.2)
103103
middleman-sitemap-ping (0.2.0)
104104
middleman-core (~> 3.0)
105-
middleman-sprockets (3.4.2)
105+
middleman-sprockets (3.5.0)
106106
middleman-core (>= 3.3)
107107
sprockets (~> 2.12.1)
108108
sprockets-helpers (~> 1.1.0)
109109
sprockets-sass (~> 1.3.0)
110-
mime-types (3.0)
110+
mime-types (3.2.2)
111111
mime-types-data (~> 3.2015)
112-
mime-types-data (3.2016.0221)
113-
mini_portile2 (2.0.0)
114-
minitest (5.8.4)
115-
multi_json (1.11.2)
112+
mime-types-data (3.2018.0812)
113+
mini_portile2 (2.3.0)
114+
minitest (5.11.3)
115+
multi_json (1.13.1)
116116
net-sftp (2.1.2)
117117
net-ssh (>= 2.6.5)
118-
net-ssh (3.1.1)
119-
nokogiri (1.6.7.2)
120-
mini_portile2 (~> 2.0.0.rc2)
121-
padrino-helpers (0.12.5)
118+
net-ssh (5.0.2)
119+
nokogiri (1.8.5)
120+
mini_portile2 (~> 2.3.0)
121+
padrino-helpers (0.12.9)
122122
i18n (~> 0.6, >= 0.6.7)
123-
padrino-support (= 0.12.5)
124-
tilt (~> 1.4.1)
125-
padrino-support (0.12.5)
123+
padrino-support (= 0.12.9)
124+
tilt (>= 1.4.1, < 3)
125+
padrino-support (0.12.9)
126126
activesupport (>= 3.1)
127-
ptools (1.3.3)
128-
rack (1.6.4)
129-
rack-livereload (0.3.16)
127+
ptools (1.3.5)
128+
rack (1.6.11)
129+
rack-livereload (0.3.17)
130130
rack
131-
rack-test (0.6.3)
132-
rack (>= 1.0)
133-
rb-fsevent (0.9.7)
134-
rb-inotify (0.9.7)
135-
ffi (>= 0.5.0)
136-
sass (3.4.22)
137-
slim (3.0.6)
138-
temple (~> 0.7.3)
131+
rack-test (1.1.0)
132+
rack (>= 1.0, < 3)
133+
rb-fsevent (0.10.3)
134+
rb-inotify (0.9.10)
135+
ffi (>= 0.5.0, < 2)
136+
sass (3.4.25)
137+
slim (3.0.9)
138+
temple (>= 0.7.6, < 0.9)
139139
tilt (>= 1.3.3, < 2.1)
140-
sprockets (2.12.4)
140+
sprockets (2.12.5)
141141
hike (~> 1.2)
142142
multi_json (~> 1.0)
143143
rack (~> 1.0)
@@ -147,17 +147,17 @@ GEM
147147
sprockets-sass (1.3.1)
148148
sprockets (~> 2.0)
149149
tilt (~> 1.1)
150-
temple (0.7.6)
151-
thor (0.19.1)
152-
thread_safe (0.3.5)
150+
temple (0.8.0)
151+
thor (0.20.3)
152+
thread_safe (0.3.6)
153153
tilt (1.4.1)
154-
tzinfo (1.2.2)
154+
tzinfo (1.2.5)
155155
thread_safe (~> 0.1)
156156
uber (0.0.15)
157157
uglifier (2.7.2)
158158
execjs (>= 0.3.0)
159159
json (>= 1.8.0)
160-
xpath (2.0.0)
160+
xpath (2.1.0)
161161
nokogiri (~> 1.3)
162162

163163
PLATFORMS
@@ -176,4 +176,4 @@ DEPENDENCIES
176176
slim (~> 3.0.6)
177177

178178
BUNDLED WITH
179-
1.11.2
179+
1.16.1

0 commit comments

Comments
 (0)