Skip to content

Commit b864361

Browse files
author
Ken Johnson
authored
Merge pull request OWASP#359 from jasnow/master
Upgraded 20 gems + Ruby plus pinned sqlite3 gem to avoid upgrade issue
2 parents 4e466f3 + c002bb4 commit b864361

File tree

5 files changed

+33
-34
lines changed

5 files changed

+33
-34
lines changed

.ruby-version

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

.travis.yml

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,8 @@
11
language: ruby
22
rvm:
3-
- "2.5.3"
3+
- "2.6.1"
44

55
before_install:
6-
- "gem install bundler"
76
- "phantomjs --version"
87
- "export PATH=${PWD}/travis_phantomjs/phantomjs-2.1.1-linux-x86_64/bin:${PATH}"
98
- "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.5.3
1+
FROM ruby:2.6.1
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
@@ -4,7 +4,7 @@ source "https://rubygems.org"
44
#don't upgrade
55
gem "rails", "5.1.6.1"
66

7-
ruby "2.5.3"
7+
ruby "2.6.1"
88

99
gem "aruba"
1010
gem "bcrypt"
@@ -23,7 +23,7 @@ gem "responders" #For Rails 4.2 # LOCKED DOWN
2323
gem "ruby-prof"
2424
gem "sass-rails"
2525
gem "simplecov", require: false, group: :test
26-
gem "sqlite3"
26+
gem "sqlite3", "1.3.13" # 2/7/2019: LOCKED DOWN
2727
gem "therubyracer"
2828
gem "turbolinks"
2929
gem "uglifier"

Gemfile.lock

Lines changed: 28 additions & 28 deletions
Original file line numberDiff line numberDiff line change
@@ -38,40 +38,40 @@ GEM
3838
i18n (>= 0.7, < 2)
3939
minitest (~> 5.1)
4040
tzinfo (~> 1.1)
41-
addressable (2.5.2)
41+
addressable (2.6.0)
4242
public_suffix (>= 2.0.2, < 4.0)
4343
arel (8.0.0)
44-
aruba (0.14.6)
45-
childprocess (>= 0.6.3, < 0.10.0)
44+
aruba (0.14.8)
45+
childprocess (>= 0.6.3, < 1.1.0)
4646
contracts (~> 0.9)
4747
cucumber (>= 1.3.19)
48-
ffi (~> 1.9.10)
48+
ffi (~> 1.9)
4949
rspec-expectations (>= 2.99)
5050
thor (~> 0.19)
5151
ast (2.4.0)
5252
backports (3.11.4)
5353
bcrypt (3.1.12)
54-
better_errors (2.5.0)
54+
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.3.1)
60+
brakeman (4.4.0)
6161
builder (3.2.3)
62-
bundler-audit (0.6.0)
63-
bundler (~> 1.2)
62+
bundler-audit (0.6.1)
63+
bundler (>= 1.2.0, < 3)
6464
thor (~> 0.18)
65-
capybara (3.12.0)
65+
capybara (3.13.2)
6666
addressable
6767
mini_mime (>= 0.1.3)
6868
nokogiri (~> 1.8)
6969
rack (>= 1.6.0)
7070
rack-test (>= 0.6.3)
7171
regexp_parser (~> 1.2)
7272
xpath (~> 3.2)
73-
childprocess (0.9.0)
74-
ffi (~> 1.0, >= 1.0.11)
73+
childprocess (1.0.1)
74+
rake (< 13.0)
7575
cliver (0.3.2)
7676
coderay (1.1.2)
7777
coffee-rails (4.2.2)
@@ -115,7 +115,7 @@ GEM
115115
thor (~> 0.19.1)
116116
formatador (0.2.5)
117117
gherkin (5.1.0)
118-
globalid (0.4.1)
118+
globalid (0.4.2)
119119
activesupport (>= 4.2.0)
120120
guard (2.15.0)
121121
formatador (>= 0.2.4)
@@ -143,9 +143,9 @@ GEM
143143
guard (>= 2.0.0)
144144
guard-compat (~> 1.0)
145145
http_parser.rb (0.6.0)
146-
i18n (1.3.0)
146+
i18n (1.5.3)
147147
concurrent-ruby (~> 1.0)
148-
jaro_winkler (1.5.1)
148+
jaro_winkler (1.5.2)
149149
jquery-fileupload-rails (1.0.0)
150150
actionpack (>= 3.1)
151151
railties (>= 3.1)
@@ -178,13 +178,13 @@ GEM
178178
mysql2 (0.5.2)
179179
nenv (0.3.0)
180180
nio4r (2.3.1)
181-
nokogiri (1.9.1)
181+
nokogiri (1.10.1)
182182
mini_portile2 (~> 2.4.0)
183183
notiffany (0.1.1)
184184
nenv (~> 0.1)
185185
shellany (~> 0.0)
186-
parallel (1.12.1)
187-
parser (2.5.3.0)
186+
parallel (1.13.0)
187+
parser (2.6.0.0)
188188
ast (~> 2.4.0)
189189
poltergeist (1.18.1)
190190
capybara (>= 2.1, < 4)
@@ -197,7 +197,7 @@ GEM
197197
pry (0.12.2)
198198
coderay (~> 1.1.0)
199199
method_source (~> 0.9.0)
200-
pry-rails (0.3.8)
200+
pry-rails (0.3.9)
201201
pry (>= 0.10.4)
202202
public_suffix (3.0.3)
203203
puma (3.12.0)
@@ -238,9 +238,9 @@ GEM
238238
ffi (~> 1.0)
239239
ref (2.0.0)
240240
regexp_parser (1.3.0)
241-
responders (2.4.0)
242-
actionpack (>= 4.2.0, < 5.3)
243-
railties (>= 4.2.0, < 5.3)
241+
responders (2.4.1)
242+
actionpack (>= 4.2.0, < 6.0)
243+
railties (>= 4.2.0, < 6.0)
244244
rspec (3.8.0)
245245
rspec-core (~> 3.8.0)
246246
rspec-expectations (~> 3.8.0)
@@ -253,7 +253,7 @@ GEM
253253
rspec-mocks (3.8.0)
254254
diff-lcs (>= 1.2.0, < 2.0)
255255
rspec-support (~> 3.8.0)
256-
rspec-rails (3.8.1)
256+
rspec-rails (3.8.2)
257257
actionpack (>= 3.0)
258258
activesupport (>= 3.0)
259259
railties (>= 3.0)
@@ -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.61.1)
265+
rubocop (0.64.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.7.2)
278+
sass (3.7.3)
279279
sass-listen (~> 4.0.0)
280280
sass-listen (4.0.0)
281281
rb-fsevent (~> 0.9, >= 0.9.4)
@@ -303,7 +303,7 @@ GEM
303303
activesupport (>= 4.0)
304304
sprockets (>= 3.0.0)
305305
sqlite3 (1.3.13)
306-
test-unit (3.2.9)
306+
test-unit (3.3.0)
307307
power_assert
308308
therubyracer (0.12.3)
309309
libv8 (~> 3.16.14.15)
@@ -370,7 +370,7 @@ DEPENDENCIES
370370
ruby-prof
371371
sass-rails
372372
simplecov
373-
sqlite3
373+
sqlite3 (= 1.3.13)
374374
test-unit
375375
therubyracer
376376
travis-lint
@@ -379,7 +379,7 @@ DEPENDENCIES
379379
unicorn
380380

381381
RUBY VERSION
382-
ruby 2.5.3p105
382+
ruby 2.6.1p33
383383

384384
BUNDLED WITH
385-
1.17.2
385+
1.17.3

0 commit comments

Comments
 (0)