Skip to content

Commit

Permalink
Merge branch 'master' into dependabot/bundler/json-2.7.2
Browse files Browse the repository at this point in the history
  • Loading branch information
Stephen committed Apr 20, 2024
2 parents 67da254 + e610f99 commit 4269c80
Show file tree
Hide file tree
Showing 2 changed files with 7 additions and 7 deletions.
4 changes: 2 additions & 2 deletions Gemfile
Original file line number Diff line number Diff line change
Expand Up @@ -20,10 +20,10 @@ gem 'ansi', '~> 1.5'
gem 'term-ansicolor', :require => 'term/ansicolor'
gem 'rubyzip', '~> 2.3'
gem 'espeak-ruby', '~> 1.1.0' # Text-to-Voice
gem 'rake', '~> 13.1'
gem 'rake', '~> 13.2'
gem 'otr-activerecord', '~> 2.2.0'
gem 'sqlite3', '~> 1.7'
gem 'rubocop', '~> 1.62.1', require: false
gem 'rubocop', '~> 1.63.2', require: false

# Geolocation support
group :geoip do
Expand Down
10 changes: 5 additions & 5 deletions Gemfile.lock
Original file line number Diff line number Diff line change
Expand Up @@ -139,7 +139,7 @@ GEM
rack-test (2.1.0)
rack (>= 1.3)
rainbow (3.1.1)
rake (13.1.0)
rake (13.2.1)
rdoc (6.6.3.1)
psych (>= 4.0.0)
regexp_parser (2.9.0)
Expand All @@ -166,7 +166,7 @@ GEM
diff-lcs (>= 1.2.0, < 2.0)
rspec-support (~> 3.13.0)
rspec-support (3.13.0)
rubocop (1.62.1)
rubocop (1.63.2)
json (~> 2.3)
language_server-protocol (>= 3.17.0)
parallel (~> 1.10)
Expand Down Expand Up @@ -200,7 +200,7 @@ GEM
sqlite3 (1.7.3-x86_64-linux)
stringio (3.1.0)
sync (0.5.0)
term-ansicolor (1.7.2)
term-ansicolor (1.8.0)
tins (~> 1.0)
test-unit (3.6.1)
power_assert
Expand Down Expand Up @@ -273,11 +273,11 @@ DEPENDENCIES
qr4r (~> 0.6.1)
rack (~> 2.2)
rack-protection (~> 3.2.0)
rake (~> 13.1)
rake (~> 13.2)
rdoc (~> 6.6)
rest-client (~> 2.1.0)
rspec (~> 3.13)
rubocop (~> 1.62.1)
rubocop (~> 1.63.2)
rubyzip (~> 2.3)
rushover (~> 0.3.0)
selenium-webdriver (~> 4.19)
Expand Down

0 comments on commit 4269c80

Please sign in to comment.