Skip to content

Commit 40aa986

Browse files
author
Robert Clark
authored
Update ruby and gems (#325)
* Upgrade to ruby 2.7.5 * Upgrade gems
1 parent 7408da4 commit 40aa986

File tree

5 files changed

+44
-39
lines changed

5 files changed

+44
-39
lines changed

.ruby-version

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
2.7.4
1+
2.7.5

Dockerfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ ENV RAILS_ENV production
99
RUN mkdir $APP_HOME
1010
WORKDIR $APP_HOME
1111

12-
RUN gem install bundler:2.2.31
12+
RUN gem install bundler:2.2.32
1313
ADD Gemfile* $APP_HOME/
1414
RUN bundle install --without development test
1515

Gemfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22

33
source 'https://rubygems.org'
44

5-
ruby '2.7.4'
5+
ruby '~> 2.7'
66

77
# Bundle edge Rails instead: gem 'rails', github: 'rails/rails'
88
gem 'rails', '~> 6.1.4'

Gemfile.lock

Lines changed: 39 additions & 36 deletions
Original file line numberDiff line numberDiff line change
@@ -67,24 +67,25 @@ GEM
6767
amoeba (3.2.0)
6868
activerecord (>= 4.2.0)
6969
ast (2.4.2)
70-
audited (5.0.1)
71-
activerecord (>= 5.0, < 6.2)
70+
audited (5.0.2)
71+
activerecord (>= 5.0, < 7.1)
7272
bcrypt (3.1.16)
7373
bindex (0.8.1)
74-
bootsnap (1.9.1)
74+
bootsnap (1.9.3)
7575
msgpack (~> 1.0)
76-
brakeman (5.1.1)
76+
brakeman (5.1.2)
7777
builder (3.2.4)
7878
byebug (11.1.3)
79-
capybara (3.35.3)
79+
capybara (3.36.0)
8080
addressable
81+
matrix
8182
mini_mime (>= 0.1.3)
8283
nokogiri (~> 1.8)
8384
rack (>= 1.6.0)
8485
rack-test (>= 0.6.3)
8586
regexp_parser (>= 1.5, < 3.0)
8687
xpath (~> 3.2)
87-
childprocess (3.0.0)
88+
childprocess (4.1.0)
8889
concurrent-ruby (1.1.9)
8990
crass (1.0.6)
9091
devise (4.8.0)
@@ -123,14 +124,14 @@ GEM
123124
faraday-rack (1.0.0)
124125
fast_excel (0.4.0)
125126
ffi (> 1.9, < 2)
126-
ffaker (2.19.0)
127+
ffaker (2.20.0)
127128
ffi (1.15.4)
128129
gitlab_omniauth-ldap (2.1.1)
129130
net-ldap (~> 0.16)
130131
omniauth (~> 1.3)
131132
pyu-ruby-sasl (>= 0.0.3.3, < 0.1)
132133
rubyntlm (~> 0.5)
133-
globalid (0.5.2)
134+
globalid (1.0.0)
134135
activesupport (>= 5.0)
135136
haml (5.2.2)
136137
temple (>= 0.8.0)
@@ -141,18 +142,18 @@ GEM
141142
haml (>= 4.0.6, < 6.0)
142143
html2haml (>= 1.0.1)
143144
railties (>= 5.1)
144-
hashie (4.1.0)
145+
hashie (5.0.0)
145146
highline (2.0.3)
146147
html2haml (2.2.0)
147148
erubis (~> 2.7.0)
148149
haml (>= 4.0, < 6)
149150
nokogiri (>= 1.6.0)
150151
ruby_parser (~> 3.5)
151-
i18n (1.8.10)
152+
i18n (1.8.11)
152153
concurrent-ruby (~> 1.0)
153-
jbuilder (2.11.2)
154+
jbuilder (2.11.3)
154155
activesupport (>= 5.0.0)
155-
jwt (2.2.3)
156+
jwt (2.3.0)
156157
launchy (2.5.0)
157158
addressable (~> 2.7)
158159
letter_opener (1.7.0)
@@ -167,8 +168,9 @@ GEM
167168
mail (2.7.1)
168169
mini_mime (>= 0.1.1)
169170
marcel (1.0.2)
171+
matrix (0.4.2)
170172
method_source (1.0.0)
171-
mini_mime (1.1.1)
173+
mini_mime (1.1.2)
172174
mini_portile2 (2.6.1)
173175
minitest (5.14.4)
174176
msgpack (1.4.2)
@@ -198,22 +200,22 @@ GEM
198200
omniauth-github (1.4.0)
199201
omniauth (~> 1.5)
200202
omniauth-oauth2 (>= 1.4.0, < 2.0)
201-
omniauth-oauth2 (1.7.1)
203+
omniauth-oauth2 (1.7.2)
202204
oauth2 (~> 1.4)
203205
omniauth (>= 1.9, < 3)
204206
omniauth-rails_csrf_protection (0.1.2)
205207
actionpack (>= 4.2)
206208
omniauth (>= 1.3.1)
207209
orm_adapter (0.5.0)
208210
parallel (1.21.0)
209-
parser (3.0.2.0)
211+
parser (3.0.3.1)
210212
ast (~> 2.4.1)
211213
pg (1.2.3)
212214
public_suffix (4.0.6)
213-
puma (4.3.9)
215+
puma (4.3.10)
214216
nio4r (~> 2.0)
215217
pyu-ruby-sasl (0.0.3.3)
216-
racc (1.5.2)
218+
racc (1.6.0)
217219
rack (2.2.3)
218220
rack-proxy (0.7.0)
219221
rack
@@ -271,38 +273,39 @@ GEM
271273
rspec-expectations (~> 3.10)
272274
rspec-mocks (~> 3.10)
273275
rspec-support (~> 3.10)
274-
rspec-support (3.10.2)
275-
rubocop (1.21.0)
276+
rspec-support (3.10.3)
277+
rubocop (1.23.0)
276278
parallel (~> 1.10)
277279
parser (>= 3.0.0.0)
278280
rainbow (>= 2.2.2, < 4.0)
279281
regexp_parser (>= 1.8, < 3.0)
280282
rexml
281-
rubocop-ast (>= 1.9.1, < 2.0)
283+
rubocop-ast (>= 1.12.0, < 2.0)
282284
ruby-progressbar (~> 1.7)
283285
unicode-display_width (>= 1.4.0, < 3.0)
284-
rubocop-ast (1.11.0)
286+
rubocop-ast (1.14.0)
285287
parser (>= 3.0.1.1)
286-
rubocop-performance (1.11.5)
288+
rubocop-performance (1.12.0)
287289
rubocop (>= 1.7.0, < 2.0)
288290
rubocop-ast (>= 0.4.0)
289-
rubocop-rails (2.12.2)
291+
rubocop-rails (2.12.4)
290292
activesupport (>= 4.2.0)
291293
rack (>= 1.1)
292294
rubocop (>= 1.7.0, < 2.0)
293295
ruby-progressbar (1.11.0)
294296
ruby2_keywords (0.0.5)
295297
ruby_dep (1.5.0)
296-
ruby_parser (3.17.0)
297-
sexp_processor (~> 4.15, >= 4.15.1)
298+
ruby_parser (3.18.1)
299+
sexp_processor (~> 4.16)
298300
rubyntlm (0.6.3)
299301
rubyzip (2.3.2)
300-
selenium-webdriver (3.142.7)
301-
childprocess (>= 0.5, < 4.0)
302+
selenium-webdriver (4.1.0)
303+
childprocess (>= 0.5, < 5.0)
304+
rexml (~> 3.2, >= 3.2.5)
302305
rubyzip (>= 1.2.2)
303306
semantic_range (3.0.0)
304307
settingslogic (2.0.9)
305-
sexp_processor (4.15.3)
308+
sexp_processor (4.16.0)
306309
simplecov (0.21.2)
307310
docile (~> 1.1)
308311
simplecov-html (~> 0.11)
@@ -316,9 +319,9 @@ GEM
316319
sprockets (4.0.2)
317320
concurrent-ruby (~> 1.0)
318321
rack (> 1, < 3)
319-
sprockets-rails (3.2.2)
320-
actionpack (>= 4.0)
321-
activesupport (>= 4.0)
322+
sprockets-rails (3.4.1)
323+
actionpack (>= 5.2)
324+
activesupport (>= 5.2)
322325
sprockets (>= 3.0.0)
323326
temple (0.8.2)
324327
thor (1.1.0)
@@ -331,15 +334,15 @@ GEM
331334
unicode-display_width (2.1.0)
332335
warden (1.2.9)
333336
rack (>= 2.0.9)
334-
web-console (4.1.0)
337+
web-console (4.2.0)
335338
actionview (>= 6.0.0)
336339
activemodel (>= 6.0.0)
337340
bindex (>= 0.4.0)
338341
railties (>= 6.0.0)
339-
webdrivers (4.6.1)
342+
webdrivers (5.0.0)
340343
nokogiri (~> 1.6)
341344
rubyzip (>= 1.3.0)
342-
selenium-webdriver (>= 3.0, < 4.0)
345+
selenium-webdriver (~> 4.0)
343346
webpacker (5.4.3)
344347
activesupport (>= 5.2)
345348
rack-proxy (>= 0.6.1)
@@ -350,7 +353,7 @@ GEM
350353
websocket-extensions (0.1.5)
351354
xpath (3.2.0)
352355
nokogiri (~> 1.8)
353-
zeitwerk (2.4.2)
356+
zeitwerk (2.5.1)
354357

355358
PLATFORMS
356359
ruby
@@ -404,4 +407,4 @@ RUBY VERSION
404407
ruby 2.7.4p191
405408

406409
BUNDLED WITH
407-
2.2.25
410+
2.2.32

spec/support/login_helpers.rb

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -16,6 +16,7 @@ def stub_base_settings(messages)
1616
def mock_omniauth_response(user)
1717
# This sets up an object that is similar to what LDAP and GitHub return to
1818
# the User.from_omniauth method
19+
# rubocop:disable Style/OpenStructUse
1920
JSON.parse({
2021
info: {
2122
name: user.name,
@@ -24,6 +25,7 @@ def mock_omniauth_response(user)
2425
provider: 'ldap',
2526
uid: FFaker::Random.rand(0...1_000_000)
2627
}.to_json, object_class: OpenStruct)
28+
# rubocop:enable Style/OpenStructUse
2729
end
2830

2931
def vulcan_sign_in_with(login_type, login_fields = {})

0 commit comments

Comments
 (0)