Skip to content

Commit d3724b8

Browse files
authored
Merge branch 'master' into test/rspec-isolation
2 parents c3e162a + eb4fa92 commit d3724b8

2 files changed

Lines changed: 14 additions & 14 deletions

File tree

Gemfile

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ gem 'rake', '~> 13.3'
2424
gem 'activerecord', '~> 8.1'
2525
gem 'otr-activerecord', '~> 2.6.0'
2626
gem 'sqlite3', '~> 2.8'
27-
gem 'rubocop', '~> 1.81.7', require: false
27+
gem 'rubocop', '~> 1.82.0', require: false
2828

2929
# Geolocation support
3030
group :geoip do
@@ -66,7 +66,7 @@ group :test do
6666
gem 'rdoc', '~> 6.17'
6767
gem 'browserstack-local', '~> 1.4'
6868

69-
gem 'irb', '~> 1.15'
69+
gem 'irb', '~> 1.16'
7070
gem 'pry-byebug', '~> 3.11'
7171

7272
gem 'rest-client', '~> 2.1.0'

Gemfile.lock

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -55,14 +55,14 @@ GEM
5555
json
5656
curb (1.2.2)
5757
daemons (1.4.1)
58-
date (3.5.0)
58+
date (3.5.1)
5959
diff-lcs (1.6.2)
6060
domain_name (0.6.20240107)
6161
drb (2.2.3)
6262
em-websocket (0.5.3)
6363
eventmachine (>= 0.12.9)
6464
http_parser.rb (~> 0)
65-
erb (6.0.0)
65+
erb (6.0.1)
6666
erubis (2.7.0)
6767
espeak-ruby (1.1.0)
6868
event_emitter (0.2.6)
@@ -80,10 +80,10 @@ GEM
8080
http_parser.rb (0.8.0)
8181
i18n (1.14.7)
8282
concurrent-ruby (~> 1.0)
83-
io-console (0.8.1)
83+
io-console (0.8.2)
8484
io-endpoint (0.15.2)
8585
io-like (0.4.0)
86-
irb (1.15.3)
86+
irb (1.16.0)
8787
pp (>= 0.6.0)
8888
rdoc (>= 4.0.0)
8989
reline (>= 0.4.2)
@@ -146,7 +146,7 @@ GEM
146146
pry-byebug (3.11.0)
147147
byebug (~> 12.0)
148148
pry (>= 0.13, < 0.16)
149-
psych (5.2.6)
149+
psych (5.3.1)
150150
date
151151
stringio
152152
public_suffix (6.0.2)
@@ -171,7 +171,7 @@ GEM
171171
psych (>= 4.0.0)
172172
tsort
173173
regexp_parser (2.11.3)
174-
reline (0.6.2)
174+
reline (0.6.3)
175175
io-console (~> 0.5)
176176
rest-client (2.1.0)
177177
http-accept (>= 1.7.0, < 2.0)
@@ -194,18 +194,18 @@ GEM
194194
diff-lcs (>= 1.2.0, < 2.0)
195195
rspec-support (~> 3.13.0)
196196
rspec-support (3.13.6)
197-
rubocop (1.81.7)
197+
rubocop (1.82.0)
198198
json (~> 2.3)
199199
language_server-protocol (~> 3.17.0.2)
200200
lint_roller (~> 1.1.0)
201201
parallel (~> 1.10)
202202
parser (>= 3.3.0.2)
203203
rainbow (>= 2.2.2, < 4.0)
204204
regexp_parser (>= 2.9.3, < 3.0)
205-
rubocop-ast (>= 1.47.1, < 2.0)
205+
rubocop-ast (>= 1.48.0, < 2.0)
206206
ruby-progressbar (~> 1.7)
207207
unicode-display_width (>= 2.4.0, < 4.0)
208-
rubocop-ast (1.47.1)
208+
rubocop-ast (1.48.0)
209209
parser (>= 3.3.7.2)
210210
prism (~> 1.4)
211211
ruby-progressbar (1.13.0)
@@ -237,7 +237,7 @@ GEM
237237
sqlite3 (2.8.1-x86_64-darwin)
238238
sqlite3 (2.8.1-x86_64-linux-gnu)
239239
sqlite3 (2.8.1-x86_64-linux-musl)
240-
stringio (3.1.9)
240+
stringio (3.2.0)
241241
sync (0.5.0)
242242
term-ansicolor (1.11.3)
243243
tins (~> 1)
@@ -312,7 +312,7 @@ DEPENDENCIES
312312
eventmachine (~> 1.2, >= 1.2.7)
313313
execjs (~> 2.10)
314314
geckodriver-helper (~> 0.24.0)
315-
irb (~> 1.15)
315+
irb (~> 1.16)
316316
json
317317
maxmind-db (~> 1.4)
318318
mime-types (~> 3.7)
@@ -328,7 +328,7 @@ DEPENDENCIES
328328
rdoc (~> 6.17)
329329
rest-client (~> 2.1.0)
330330
rspec (~> 3.13)
331-
rubocop (~> 1.81.7)
331+
rubocop (~> 1.82.0)
332332
rubyzip (~> 3.2)
333333
rushover (~> 0.3.0)
334334
selenium-webdriver (~> 4.39)

0 commit comments

Comments
 (0)