Skip to content

Commit 301eb01

Browse files
author
Ken Johnson
authored
Merge pull request OWASP#360 from jasnow/master
Upgraded Ruby to 2.6.2, Rails to 5.1.7 plus 21 other gems
2 parents b864361 + 1e559d0 commit 301eb01

File tree

5 files changed

+65
-65
lines changed

5 files changed

+65
-65
lines changed

.ruby-version

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
2.6.1
1+
2.6.2

.travis.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
language: ruby
22
rvm:
3-
- "2.6.1"
3+
- "2.6.2"
44

55
before_install:
66
- "phantomjs --version"

Dockerfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
FROM ruby:2.6.1
1+
FROM ruby:2.6.2
22
RUN apt-get update -qq && apt-get install -y build-essential libpq-dev nodejs
33
RUN mkdir /myapp
44
WORKDIR /myapp

Gemfile

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,9 +2,9 @@
22
source "https://rubygems.org"
33

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

7-
ruby "2.6.1"
7+
ruby "2.6.2"
88

99
gem "aruba"
1010
gem "bcrypt"

Gemfile.lock

Lines changed: 60 additions & 60 deletions
Original file line numberDiff line numberDiff line change
@@ -1,68 +1,68 @@
11
GEM
22
remote: https://rubygems.org/
33
specs:
4-
actioncable (5.1.6.1)
5-
actionpack (= 5.1.6.1)
4+
actioncable (5.1.7)
5+
actionpack (= 5.1.7)
66
nio4r (~> 2.0)
77
websocket-driver (~> 0.6.1)
8-
actionmailer (5.1.6.1)
9-
actionpack (= 5.1.6.1)
10-
actionview (= 5.1.6.1)
11-
activejob (= 5.1.6.1)
8+
actionmailer (5.1.7)
9+
actionpack (= 5.1.7)
10+
actionview (= 5.1.7)
11+
activejob (= 5.1.7)
1212
mail (~> 2.5, >= 2.5.4)
1313
rails-dom-testing (~> 2.0)
14-
actionpack (5.1.6.1)
15-
actionview (= 5.1.6.1)
16-
activesupport (= 5.1.6.1)
14+
actionpack (5.1.7)
15+
actionview (= 5.1.7)
16+
activesupport (= 5.1.7)
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.1)
22-
activesupport (= 5.1.6.1)
21+
actionview (5.1.7)
22+
activesupport (= 5.1.7)
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.1)
28-
activesupport (= 5.1.6.1)
27+
activejob (5.1.7)
28+
activesupport (= 5.1.7)
2929
globalid (>= 0.3.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)
30+
activemodel (5.1.7)
31+
activesupport (= 5.1.7)
32+
activerecord (5.1.7)
33+
activemodel (= 5.1.7)
34+
activesupport (= 5.1.7)
3535
arel (~> 8.0)
36-
activesupport (5.1.6.1)
36+
activesupport (5.1.7)
3737
concurrent-ruby (~> 1.0, >= 1.0.2)
3838
i18n (>= 0.7, < 2)
3939
minitest (~> 5.1)
4040
tzinfo (~> 1.1)
4141
addressable (2.6.0)
4242
public_suffix (>= 2.0.2, < 4.0)
4343
arel (8.0.0)
44-
aruba (0.14.8)
44+
aruba (0.14.9)
4545
childprocess (>= 0.6.3, < 1.1.0)
4646
contracts (~> 0.9)
4747
cucumber (>= 1.3.19)
4848
ffi (~> 1.9)
4949
rspec-expectations (>= 2.99)
5050
thor (~> 0.19)
5151
ast (2.4.0)
52-
backports (3.11.4)
52+
backports (3.13.0)
5353
bcrypt (3.1.12)
5454
better_errors (2.5.1)
5555
coderay (>= 1.0.0)
5656
erubi (>= 1.0.0)
5757
rack (>= 0.9.0)
5858
binding_of_caller (0.8.0)
5959
debug_inspector (>= 0.0.1)
60-
brakeman (4.4.0)
60+
brakeman (4.5.0)
6161
builder (3.2.3)
6262
bundler-audit (0.6.1)
6363
bundler (>= 1.2.0, < 3)
6464
thor (~> 0.18)
65-
capybara (3.13.2)
65+
capybara (3.16.1)
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.1.4)
84+
concurrent-ruby (1.1.5)
8585
contracts (0.16.0)
8686
crass (1.0.4)
8787
cucumber (3.1.2)
@@ -110,7 +110,7 @@ GEM
110110
erubi (1.8.0)
111111
eventmachine (1.2.7)
112112
execjs (2.7.0)
113-
ffi (1.9.25)
113+
ffi (1.10.0)
114114
foreman (0.85.0)
115115
thor (~> 0.19.1)
116116
formatador (0.2.5)
@@ -143,7 +143,7 @@ GEM
143143
guard (>= 2.0.0)
144144
guard-compat (~> 1.0)
145145
http_parser.rb (0.6.0)
146-
i18n (1.5.3)
146+
i18n (1.6.0)
147147
concurrent-ruby (~> 1.0)
148148
jaro_winkler (1.5.2)
149149
jquery-fileupload-rails (1.0.0)
@@ -154,7 +154,7 @@ GEM
154154
rails-dom-testing (>= 1, < 3)
155155
railties (>= 4.2.0)
156156
thor (>= 0.14, < 2.0)
157-
json (2.1.0)
157+
json (2.2.0)
158158
kgio (2.11.2)
159159
launchy (2.4.3)
160160
addressable (~> 2.3)
@@ -178,55 +178,55 @@ GEM
178178
mysql2 (0.5.2)
179179
nenv (0.3.0)
180180
nio4r (2.3.1)
181-
nokogiri (1.10.1)
181+
nokogiri (1.10.2)
182182
mini_portile2 (~> 2.4.0)
183183
notiffany (0.1.1)
184184
nenv (~> 0.1)
185185
shellany (~> 0.0)
186-
parallel (1.13.0)
187-
parser (2.6.0.0)
186+
parallel (1.17.0)
187+
parser (2.6.2.1)
188188
ast (~> 2.4.0)
189189
poltergeist (1.18.1)
190190
capybara (>= 2.1, < 4)
191191
cliver (~> 0.3.1)
192192
websocket-driver (>= 0.2.0)
193193
powder (0.4.0)
194194
thor (>= 0.11.5)
195-
power_assert (1.1.3)
196-
powerpack (0.1.2)
195+
power_assert (1.1.4)
197196
pry (0.12.2)
198197
coderay (~> 1.1.0)
199198
method_source (~> 0.9.0)
200199
pry-rails (0.3.9)
201200
pry (>= 0.10.4)
201+
psych (3.1.0)
202202
public_suffix (3.0.3)
203-
puma (3.12.0)
204-
rack (2.0.6)
203+
puma (3.12.1)
204+
rack (2.0.7)
205205
rack-livereload (0.3.17)
206206
rack
207207
rack-test (1.1.0)
208208
rack (>= 1.0, < 3)
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)
209+
rails (5.1.7)
210+
actioncable (= 5.1.7)
211+
actionmailer (= 5.1.7)
212+
actionpack (= 5.1.7)
213+
actionview (= 5.1.7)
214+
activejob (= 5.1.7)
215+
activemodel (= 5.1.7)
216+
activerecord (= 5.1.7)
217+
activesupport (= 5.1.7)
218218
bundler (>= 1.3.0)
219-
railties (= 5.1.6.1)
219+
railties (= 5.1.7)
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.1)
228-
actionpack (= 5.1.6.1)
229-
activesupport (= 5.1.6.1)
227+
railties (5.1.7)
228+
actionpack (= 5.1.7)
229+
activesupport (= 5.1.7)
230230
method_source
231231
rake (>= 0.8.7)
232232
thor (>= 0.18.1, < 2.0)
@@ -237,7 +237,7 @@ GEM
237237
rb-inotify (0.10.0)
238238
ffi (~> 1.0)
239239
ref (2.0.0)
240-
regexp_parser (1.3.0)
240+
regexp_parser (1.4.0)
241241
responders (2.4.1)
242242
actionpack (>= 4.2.0, < 6.0)
243243
railties (>= 4.2.0, < 6.0)
@@ -262,20 +262,20 @@ GEM
262262
rspec-mocks (~> 3.8.0)
263263
rspec-support (~> 3.8.0)
264264
rspec-support (3.8.0)
265-
rubocop (0.64.0)
265+
rubocop (0.67.2)
266266
jaro_winkler (~> 1.5.1)
267267
parallel (~> 1.10)
268268
parser (>= 2.5, != 2.5.1.1)
269-
powerpack (~> 0.1)
269+
psych (>= 3.1.0)
270270
rainbow (>= 2.2.2, < 4.0)
271271
ruby-progressbar (~> 1.7)
272-
unicode-display_width (~> 1.4.0)
272+
unicode-display_width (>= 1.4.0, < 1.6)
273273
rubocop-github (0.12.0)
274274
rubocop (~> 0.59)
275275
ruby-prof (0.17.0)
276276
ruby-progressbar (1.10.0)
277277
ruby_dep (1.5.0)
278-
sass (3.7.3)
278+
sass (3.7.4)
279279
sass-listen (~> 4.0.0)
280280
sass-listen (4.0.0)
281281
rb-fsevent (~> 0.9, >= 0.9.4)
@@ -286,8 +286,8 @@ 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)
289+
sassc (2.0.1)
290+
ffi (~> 1.9)
291291
rake
292292
shellany (0.0.1)
293293
simplecov (0.16.1)
@@ -303,7 +303,7 @@ GEM
303303
activesupport (>= 4.0)
304304
sprockets (>= 3.0.0)
305305
sqlite3 (1.3.13)
306-
test-unit (3.3.0)
306+
test-unit (3.3.1)
307307
power_assert
308308
therubyracer (0.12.3)
309309
libv8 (~> 3.16.14.15)
@@ -320,8 +320,8 @@ GEM
320320
thread_safe (~> 0.1)
321321
uglifier (4.1.20)
322322
execjs (>= 0.3.0, < 3)
323-
unicode-display_width (1.4.1)
324-
unicorn (5.4.1)
323+
unicode-display_width (1.5.0)
324+
unicorn (5.5.0)
325325
kgio (~> 2.6)
326326
raindrops (~> 0.7)
327327
websocket-driver (0.6.5)
@@ -360,7 +360,7 @@ DEPENDENCIES
360360
pry-rails
361361
puma
362362
rack-livereload
363-
rails (= 5.1.6.1)
363+
rails (= 5.1.7)
364364
rails-perftest
365365
rake
366366
rb-fsevent
@@ -379,7 +379,7 @@ DEPENDENCIES
379379
unicorn
380380

381381
RUBY VERSION
382-
ruby 2.6.1p33
382+
ruby 2.6.2p47
383383

384384
BUNDLED WITH
385-
1.17.3
385+
1.17.2

0 commit comments

Comments
 (0)