Skip to content

Commit

Permalink
Merge branch 'master' into dependabot/bundler/rdoc-6.7.0
Browse files Browse the repository at this point in the history
  • Loading branch information
Stephen committed May 23, 2024
2 parents a3221b4 + f679efb commit 26531fe
Show file tree
Hide file tree
Showing 2 changed files with 8 additions and 8 deletions.
4 changes: 2 additions & 2 deletions Gemfile
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ gem 'espeak-ruby', '~> 1.1.0' # Text-to-Voice
gem 'rake', '~> 13.2'
gem 'otr-activerecord', '~> 2.2.0'
gem 'sqlite3', '~> 1.4'
gem 'rubocop', '~> 1.63.5', require: false
gem 'rubocop', '~> 1.64.0', require: false

# Geolocation support
group :geoip do
Expand Down Expand Up @@ -78,7 +78,7 @@ group :test do
# Note: selenium-webdriver 3.x is incompatible with Firefox version 48 and prior
# gem 'selenium' # Requires old version of selenium which is no longer available
gem 'geckodriver-helper', '~> 0.24.0'
gem 'selenium-webdriver', '~> 4.20'
gem 'selenium-webdriver', '~> 4.21'

# Note: nokogiri is needed by capybara which may require one of the below commands
# sudo apt-get install libxslt-dev libxml2-dev
Expand Down
12 changes: 6 additions & 6 deletions Gemfile.lock
Original file line number Diff line number Diff line change
Expand Up @@ -131,7 +131,7 @@ GEM
qr4r (0.6.2)
mojo_magick (~> 0.6.5)
rqrcode_core (~> 1.0)
racc (1.7.3)
racc (1.8.0)
rack (2.2.9)
rack-protection (3.2.0)
base64 (>= 0.1.0)
Expand All @@ -142,7 +142,7 @@ GEM
rake (13.2.1)
rdoc (6.7.0)
psych (>= 4.0.0)
regexp_parser (2.9.0)
regexp_parser (2.9.2)
reline (0.5.5)
io-console (~> 0.5)
rest-client (2.1.0)
Expand All @@ -167,7 +167,7 @@ GEM
diff-lcs (>= 1.2.0, < 2.0)
rspec-support (~> 3.13.0)
rspec-support (3.13.0)
rubocop (1.63.5)
rubocop (1.64.0)
json (~> 2.3)
language_server-protocol (>= 3.17.0)
parallel (~> 1.10)
Expand All @@ -186,7 +186,7 @@ GEM
rushover (0.3.0)
json
rest-client
selenium-webdriver (4.20.1)
selenium-webdriver (4.21.1)
base64 (~> 0.2)
rexml (~> 3.2, >= 3.2.5)
rubyzip (>= 1.2.2, < 3.0)
Expand Down Expand Up @@ -279,10 +279,10 @@ DEPENDENCIES
rdoc (~> 6.7)
rest-client (~> 2.1.0)
rspec (~> 3.13)
rubocop (~> 1.63.5)
rubocop (~> 1.64.0)
rubyzip (~> 2.3)
rushover (~> 0.3.0)
selenium-webdriver (~> 4.20)
selenium-webdriver (~> 4.21)
sinatra (~> 3.2)
slack-notifier (~> 2.4)
sqlite3 (~> 1.4)
Expand Down

0 comments on commit 26531fe

Please sign in to comment.