Skip to content

Commit 9c10111

Browse files
author
Ken Johnson
authored
Merge pull request OWASP#357 from jasnow/master
Upgraded Rails to 5.1.6.1 plus 13 more gem upgrades
2 parents 0082521 + 3034fbe commit 9c10111

File tree

2 files changed

+52
-49
lines changed

2 files changed

+52
-49
lines changed

Gemfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
source "https://rubygems.org"
33

44
#don't upgrade
5-
gem "rails", "5.1.6"
5+
gem "rails", "5.1.6.1"
66

77
ruby "2.5.3"
88

Gemfile.lock

Lines changed: 51 additions & 48 deletions
Original file line numberDiff line numberDiff line change
@@ -1,39 +1,39 @@
11
GEM
22
remote: https://rubygems.org/
33
specs:
4-
actioncable (5.1.6)
5-
actionpack (= 5.1.6)
4+
actioncable (5.1.6.1)
5+
actionpack (= 5.1.6.1)
66
nio4r (~> 2.0)
77
websocket-driver (~> 0.6.1)
8-
actionmailer (5.1.6)
9-
actionpack (= 5.1.6)
10-
actionview (= 5.1.6)
11-
activejob (= 5.1.6)
8+
actionmailer (5.1.6.1)
9+
actionpack (= 5.1.6.1)
10+
actionview (= 5.1.6.1)
11+
activejob (= 5.1.6.1)
1212
mail (~> 2.5, >= 2.5.4)
1313
rails-dom-testing (~> 2.0)
14-
actionpack (5.1.6)
15-
actionview (= 5.1.6)
16-
activesupport (= 5.1.6)
14+
actionpack (5.1.6.1)
15+
actionview (= 5.1.6.1)
16+
activesupport (= 5.1.6.1)
1717
rack (~> 2.0)
1818
rack-test (>= 0.6.3)
1919
rails-dom-testing (~> 2.0)
2020
rails-html-sanitizer (~> 1.0, >= 1.0.2)
21-
actionview (5.1.6)
22-
activesupport (= 5.1.6)
21+
actionview (5.1.6.1)
22+
activesupport (= 5.1.6.1)
2323
builder (~> 3.1)
2424
erubi (~> 1.4)
2525
rails-dom-testing (~> 2.0)
2626
rails-html-sanitizer (~> 1.0, >= 1.0.3)
27-
activejob (5.1.6)
28-
activesupport (= 5.1.6)
27+
activejob (5.1.6.1)
28+
activesupport (= 5.1.6.1)
2929
globalid (>= 0.3.6)
30-
activemodel (5.1.6)
31-
activesupport (= 5.1.6)
32-
activerecord (5.1.6)
33-
activemodel (= 5.1.6)
34-
activesupport (= 5.1.6)
30+
activemodel (5.1.6.1)
31+
activesupport (= 5.1.6.1)
32+
activerecord (5.1.6.1)
33+
activemodel (= 5.1.6.1)
34+
activesupport (= 5.1.6.1)
3535
arel (~> 8.0)
36-
activesupport (5.1.6)
36+
activesupport (5.1.6.1)
3737
concurrent-ruby (~> 1.0, >= 1.0.2)
3838
i18n (>= 0.7, < 2)
3939
minitest (~> 5.1)
@@ -62,7 +62,7 @@ GEM
6262
bundler-audit (0.6.0)
6363
bundler (~> 1.2)
6464
thor (~> 0.18)
65-
capybara (3.10.0)
65+
capybara (3.12.0)
6666
addressable
6767
mini_mime (>= 0.1.3)
6868
nokogiri (~> 1.8)
@@ -81,7 +81,7 @@ GEM
8181
coffee-script-source
8282
execjs
8383
coffee-script-source (1.12.2)
84-
concurrent-ruby (1.0.5)
84+
concurrent-ruby (1.1.3)
8585
contracts (0.16.0)
8686
crass (1.0.4)
8787
cucumber (3.1.2)
@@ -117,7 +117,7 @@ GEM
117117
gherkin (5.1.0)
118118
globalid (0.4.1)
119119
activesupport (>= 4.2.0)
120-
guard (2.14.2)
120+
guard (2.15.0)
121121
formatador (>= 0.2.4)
122122
listen (>= 2.7, < 4.0)
123123
lumberjack (>= 1.0.12, < 2.0)
@@ -146,10 +146,10 @@ GEM
146146
i18n (1.1.1)
147147
concurrent-ruby (~> 1.0)
148148
jaro_winkler (1.5.1)
149-
jquery-fileupload-rails (0.4.7)
149+
jquery-fileupload-rails (1.0.0)
150150
actionpack (>= 3.1)
151151
railties (>= 3.1)
152-
sass (>= 3.2)
152+
sassc
153153
jquery-rails (4.3.3)
154154
rails-dom-testing (>= 1, < 3)
155155
railties (>= 4.2.0)
@@ -169,7 +169,7 @@ GEM
169169
lumberjack (1.0.13)
170170
mail (2.7.1)
171171
mini_mime (>= 0.1.1)
172-
method_source (0.9.0)
172+
method_source (0.9.2)
173173
mini_mime (1.0.1)
174174
mini_portile2 (2.3.0)
175175
minitest (5.11.3)
@@ -194,39 +194,39 @@ GEM
194194
thor (>= 0.11.5)
195195
power_assert (1.1.3)
196196
powerpack (0.1.2)
197-
pry (0.11.3)
197+
pry (0.12.2)
198198
coderay (~> 1.1.0)
199199
method_source (~> 0.9.0)
200-
pry-rails (0.3.6)
200+
pry-rails (0.3.8)
201201
pry (>= 0.10.4)
202202
public_suffix (3.0.3)
203203
puma (3.12.0)
204-
rack (2.0.5)
204+
rack (2.0.6)
205205
rack-livereload (0.3.17)
206206
rack
207207
rack-test (1.1.0)
208208
rack (>= 1.0, < 3)
209-
rails (5.1.6)
210-
actioncable (= 5.1.6)
211-
actionmailer (= 5.1.6)
212-
actionpack (= 5.1.6)
213-
actionview (= 5.1.6)
214-
activejob (= 5.1.6)
215-
activemodel (= 5.1.6)
216-
activerecord (= 5.1.6)
217-
activesupport (= 5.1.6)
209+
rails (5.1.6.1)
210+
actioncable (= 5.1.6.1)
211+
actionmailer (= 5.1.6.1)
212+
actionpack (= 5.1.6.1)
213+
actionview (= 5.1.6.1)
214+
activejob (= 5.1.6.1)
215+
activemodel (= 5.1.6.1)
216+
activerecord (= 5.1.6.1)
217+
activesupport (= 5.1.6.1)
218218
bundler (>= 1.3.0)
219-
railties (= 5.1.6)
219+
railties (= 5.1.6.1)
220220
sprockets-rails (>= 2.0.0)
221221
rails-dom-testing (2.0.3)
222222
activesupport (>= 4.2.0)
223223
nokogiri (>= 1.6)
224224
rails-html-sanitizer (1.0.4)
225225
loofah (~> 2.2, >= 2.2.2)
226226
rails-perftest (0.0.7)
227-
railties (5.1.6)
228-
actionpack (= 5.1.6)
229-
activesupport (= 5.1.6)
227+
railties (5.1.6.1)
228+
actionpack (= 5.1.6.1)
229+
activesupport (= 5.1.6.1)
230230
method_source
231231
rake (>= 0.8.7)
232232
thor (>= 0.18.1, < 2.0)
@@ -237,7 +237,7 @@ GEM
237237
rb-inotify (0.9.10)
238238
ffi (>= 0.5.0, < 2)
239239
ref (2.0.0)
240-
regexp_parser (1.2.0)
240+
regexp_parser (1.3.0)
241241
responders (2.4.0)
242242
actionpack (>= 4.2.0, < 5.3)
243243
railties (>= 4.2.0, < 5.3)
@@ -262,7 +262,7 @@ GEM
262262
rspec-mocks (~> 3.8.0)
263263
rspec-support (~> 3.8.0)
264264
rspec-support (3.8.0)
265-
rubocop (0.60.0)
265+
rubocop (0.61.0)
266266
jaro_winkler (~> 1.5.1)
267267
parallel (~> 1.10)
268268
parser (>= 2.5, != 2.5.1.1)
@@ -275,7 +275,7 @@ GEM
275275
ruby-prof (0.17.0)
276276
ruby-progressbar (1.10.0)
277277
ruby_dep (1.5.0)
278-
sass (3.6.0)
278+
sass (3.7.2)
279279
sass-listen (~> 4.0.0)
280280
sass-listen (4.0.0)
281281
rb-fsevent (~> 0.9, >= 0.9.4)
@@ -286,6 +286,9 @@ GEM
286286
sprockets (>= 2.8, < 4.0)
287287
sprockets-rails (>= 2.0, < 4.0)
288288
tilt (>= 1.1, < 3)
289+
sassc (2.0.0)
290+
ffi (~> 1.9.6)
291+
rake
289292
shellany (0.0.1)
290293
simplecov (0.16.1)
291294
docile (~> 1.1)
@@ -300,22 +303,22 @@ GEM
300303
activesupport (>= 4.0)
301304
sprockets (>= 3.0.0)
302305
sqlite3 (1.3.13)
303-
test-unit (3.2.8)
306+
test-unit (3.2.9)
304307
power_assert
305308
therubyracer (0.12.3)
306309
libv8 (~> 3.16.14.15)
307310
ref
308311
thor (0.19.4)
309312
thread_safe (0.3.6)
310-
tilt (2.0.8)
313+
tilt (2.0.9)
311314
travis-lint (2.0.0)
312315
json
313316
turbolinks (5.2.0)
314317
turbolinks-source (~> 5.2)
315318
turbolinks-source (5.2.0)
316319
tzinfo (1.2.5)
317320
thread_safe (~> 0.1)
318-
uglifier (4.1.19)
321+
uglifier (4.1.20)
319322
execjs (>= 0.3.0, < 3)
320323
unicode-display_width (1.4.0)
321324
unicorn (5.4.1)
@@ -357,7 +360,7 @@ DEPENDENCIES
357360
pry-rails
358361
puma
359362
rack-livereload
360-
rails (= 5.1.6)
363+
rails (= 5.1.6.1)
361364
rails-perftest
362365
rake
363366
rb-fsevent

0 commit comments

Comments
 (0)