Skip to content

Commit

Permalink
Merge branch 'main' into enhancement/accessibility-testing
Browse files Browse the repository at this point in the history
  • Loading branch information
@rsmithlal
rsmithlal authored Jul 20, 2024
2 parents 4880a98 + 8c42154 commit 6ebf641
Show file tree
Hide file tree
Showing 3 changed files with 48 additions and 46 deletions.
2 changes: 1 addition & 1 deletion Gemfile
View file
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,7 @@ gem 'redis', '~> 5.2'
gem 'rswag'

# Sidekiq for background processing
gem 'sidekiq', '~> 7.2.4'
gem 'sidekiq', '~> 7.3.0'

# Error and performance monitoring with Sentry
gem 'sentry-rails'
Expand Down
89 changes: 46 additions & 43 deletions Gemfile.lock
View file
Original file line number Diff line number Diff line change
Expand Up @@ -129,19 +129,19 @@ GEM
autoprefixer-rails (10.4.16.0)
execjs (~> 2)
aws-eventstream (1.3.0)
aws-partitions (1.944.0)
aws-sdk-core (3.197.0)
aws-partitions (1.950.0)
aws-sdk-core (3.201.0)
aws-eventstream (~> 1, >= 1.3.0)
aws-partitions (~> 1, >= 1.651.0)
aws-sigv4 (~> 1.8)
jmespath (~> 1, >= 1.6.1)
aws-sdk-kms (1.84.0)
aws-sdk-core (~> 3, >= 3.197.0)
aws-sigv4 (~> 1.1)
aws-sdk-s3 (1.152.3)
aws-sdk-core (~> 3, >= 3.197.0)
aws-sdk-kms (1.88.0)
aws-sdk-core (~> 3, >= 3.201.0)
aws-sigv4 (~> 1.5)
aws-sdk-s3 (1.156.0)
aws-sdk-core (~> 3, >= 3.201.0)
aws-sdk-kms (~> 1)
aws-sigv4 (~> 1.8)
aws-sigv4 (~> 1.5)
aws-sigv4 (1.8.0)
aws-eventstream (~> 1, >= 1.0.2)
base64 (0.2.0)
Expand Down Expand Up @@ -193,7 +193,7 @@ GEM
tilt
database_cleaner (2.0.2)
database_cleaner-active_record (>= 2, < 3)
database_cleaner-active_record (2.1.0)
database_cleaner-active_record (2.2.0)
activerecord (>= 5.a)
database_cleaner-core (~> 2.0.0)
database_cleaner-core (2.0.1)
Expand All @@ -206,9 +206,9 @@ GEM
railties (>= 4.1.0)
responders
warden (~> 1.2.3)
devise-jwt (0.11.0)
devise-jwt (0.12.1)
devise (~> 4.0)
warden-jwt_auth (~> 0.8)
warden-jwt_auth (~> 0.10)
diff-lcs (1.5.1)
disposable (0.6.3)
declarative (>= 0.0.9, < 1.0.0)
Expand All @@ -220,24 +220,24 @@ GEM
dry-auto_inject (1.0.1)
dry-core (~> 1.0)
zeitwerk (~> 2.6)
dry-configurable (1.1.0)
dry-configurable (1.2.0)
dry-core (~> 1.0, < 2)
zeitwerk (~> 2.6)
dry-core (1.0.1)
concurrent-ruby (~> 1.0)
zeitwerk (~> 2.6)
erubi (1.12.0)
excon (0.110.0)
erubi (1.13.0)
excon (0.111.0)
execjs (2.9.1)
factory_bot (6.4.5)
activesupport (>= 5.0.0)
factory_bot_rails (6.4.3)
factory_bot (~> 6.4)
railties (>= 5.0.0)
faker (3.4.1)
faker (3.4.2)
i18n (>= 1.8.11, < 2)
ffi (1.17.0-x86_64-linux-gnu)
fog-aws (3.22.0)
fog-aws (3.24.0)
fog-core (~> 2.1)
fog-json (~> 1.1)
fog-xml (~> 0.1)
Expand Down Expand Up @@ -281,7 +281,7 @@ GEM
activesupport (>= 6.0.0)
railties (>= 6.0.0)
io-console (0.7.2)
irb (1.13.1)
irb (1.14.0)
rdoc (>= 4.0.0)
reline (>= 0.4.2)
jmespath (1.6.2)
Expand All @@ -292,12 +292,13 @@ GEM
activerecord (>= 4.1)
concurrent-ruby
railties (>= 4.1)
jwt (2.8.1)
jwt (2.8.2)
base64
language_server-protocol (3.17.0.3)
listen (3.9.0)
rb-fsevent (~> 0.10, >= 0.10.3)
rb-inotify (~> 0.9, >= 0.9.10)
logger (1.6.0)
loofah (2.22.0)
crass (~> 1.0.2)
nokogiri (>= 1.12.0)
Expand All @@ -309,12 +310,12 @@ GEM
marcel (1.0.4)
matrix (0.4.2)
method_source (1.1.0)
mime-types (3.5.1)
mime-types (3.5.2)
mime-types-data (~> 3.2015)
mime-types-data (3.2023.1003)
mime-types-data (3.2024.0702)
mini_magick (4.12.0)
mini_mime (1.1.5)
minitest (5.23.1)
minitest (5.24.1)
mobility (1.2.9)
i18n (>= 0.6.10, < 2)
request_store (~> 1.0)
Expand All @@ -335,12 +336,12 @@ GEM
net-protocol
netrc (0.11.0)
nio4r (2.7.3)
nokogiri (1.16.5-x86_64-linux)
nokogiri (1.16.6-x86_64-linux)
racc (~> 1.4)
optimist (3.1.0)
orm_adapter (0.5.0)
parallel (1.25.1)
parser (3.3.2.0)
parser (3.3.4.0)
ast (~> 2.4.1)
racc
pg (1.5.6)
Expand All @@ -356,7 +357,7 @@ GEM
pundit (2.3.2)
activesupport (>= 3.0.0)
racc (1.8.0)
rack (3.1.2)
rack (3.1.7)
rack-cors (2.0.2)
rack (>= 2.0.0)
rack-mini-profiler (3.3.1)
Expand Down Expand Up @@ -424,7 +425,7 @@ GEM
activemodel (>= 5.0)
reform (>= 2.3.1, < 3.0.0)
regexp_parser (2.9.2)
reline (0.5.8)
reline (0.5.9)
io-console (~> 0.5)
representable (3.2.0)
declarative (< 0.1.0)
Expand All @@ -440,7 +441,7 @@ GEM
http-cookie (>= 1.0.2, < 2.0)
mime-types (>= 1.16, < 4.0)
netrc (~> 0.8)
rexml (3.3.0)
rexml (3.3.2)
strscan
rgeo (3.0.1)
rgeo-activerecord (7.0.1)
Expand All @@ -453,13 +454,13 @@ GEM
rspec-mocks (~> 3.13.0)
rspec-core (3.13.0)
rspec-support (~> 3.13.0)
rspec-expectations (3.13.0)
rspec-expectations (3.13.1)
diff-lcs (>= 1.2.0, < 2.0)
rspec-support (~> 3.13.0)
rspec-mocks (3.13.0)
rspec-mocks (3.13.1)
diff-lcs (>= 1.2.0, < 2.0)
rspec-support (~> 3.13.0)
rspec-rails (6.1.2)
rspec-rails (6.1.3)
actionpack (>= 6.1)
activesupport (>= 6.1)
railties (>= 6.1)
Expand All @@ -483,20 +484,20 @@ GEM
rswag-ui (2.13.0)
actionpack (>= 3.1, < 7.2)
railties (>= 3.1, < 7.2)
rubocop (1.64.1)
rubocop (1.65.0)
json (~> 2.3)
language_server-protocol (>= 3.17.0)
parallel (~> 1.10)
parser (>= 3.3.0.2)
rainbow (>= 2.2.2, < 4.0)
regexp_parser (>= 1.8, < 3.0)
regexp_parser (>= 2.4, < 3.0)
rexml (>= 3.2.5, < 4.0)
rubocop-ast (>= 1.31.1, < 2.0)
ruby-progressbar (~> 1.7)
unicode-display_width (>= 2.4.0, < 3.0)
rubocop-ast (1.31.3)
parser (>= 3.3.1.0)
rubocop-rspec (3.0.1)
rubocop-rspec (3.0.3)
rubocop (~> 1.61)
ruby-progressbar (1.13.0)
ruby-vips (2.2.1)
Expand All @@ -508,26 +509,28 @@ GEM
ffi (~> 1.9)
sassc-embedded (1.76.0)
sass-embedded (~> 1.76)
selenium-webdriver (4.21.1)
selenium-webdriver (4.22.0)
base64 (~> 0.2)
logger (~> 1.4)
rexml (~> 3.2, >= 3.2.5)
rubyzip (>= 1.2.2, < 3.0)
websocket (~> 1.0)
sentry-rails (5.17.3)
sentry-rails (5.18.1)
railties (>= 5.0)
sentry-ruby (~> 5.17.3)
sentry-ruby (5.17.3)
sentry-ruby (~> 5.18.1)
sentry-ruby (5.18.1)
bigdecimal
concurrent-ruby (~> 1.0, >= 1.0.2)
shoulda-callback-matchers (1.1.4)
activesupport (>= 3)
shoulda-matchers (6.2.0)
activesupport (>= 5.2.0)
sidekiq (7.2.4)
sidekiq (7.3.0)
concurrent-ruby (< 2)
connection_pool (>= 2.3.0)
logger
rack (>= 2.2.4)
redis-client (>= 0.19.0)
redis-client (>= 0.22.2)
simplecov (0.22.0)
docile (~> 1.1)
simplecov-html (~> 0.11)
Expand All @@ -548,7 +551,7 @@ GEM
stackprof (0.2.26)
stimulus-rails (1.3.3)
railties (>= 6.0.0)
stringio (3.1.0)
stringio (3.1.1)
strscan (3.1.0)
sync (0.5.0)
term-ansicolor (1.7.1)
Expand All @@ -559,7 +562,7 @@ GEM
tins (1.32.1)
sync
trailblazer-option (0.1.2)
turbo-rails (2.0.5)
turbo-rails (2.0.6)
actionpack (>= 6.0.0)
activejob (>= 6.0.0)
railties (>= 6.0.0)
Expand All @@ -574,7 +577,7 @@ GEM
unicode-display_width (2.5.0)
warden (1.2.9)
rack (>= 2.0.9)
warden-jwt_auth (0.8.0)
warden-jwt_auth (0.10.0)
dry-auto_inject (>= 0.8, < 2)
dry-configurable (>= 0.13, < 2)
jwt (~> 2.1)
Expand All @@ -595,7 +598,7 @@ GEM
websocket-extensions (0.1.5)
xpath (3.2.0)
nokogiri (~> 1.8)
zeitwerk (2.6.15)
zeitwerk (2.6.16)

PLATFORMS
x86_64-linux
Expand Down Expand Up @@ -640,7 +643,7 @@ DEPENDENCIES
sentry-ruby
shoulda-callback-matchers
shoulda-matchers
sidekiq (~> 7.2.4)
sidekiq (~> 7.3.0)
simplecov
spring
spring-watcher-listen (~> 2.1.0)
Expand Down
3 changes: 1 addition & 2 deletions lib/better_together/engine.rb
View file
Original file line number Diff line number Diff line change
Expand Up @@ -42,8 +42,7 @@ class Engine < ::Rails::Engine

default_url_options = {
host: ENV.fetch('APP_HOST', 'localhost:3000'),
protocol: ENV.fetch('APP_PROTOCOL', 'http'),
locale: ENV.fetch('APP_LOCALE', I18n.locale)
protocol: ENV.fetch('APP_PROTOCOL', 'http')
}

routes.default_url_options =
Expand Down

0 comments on commit 6ebf641

Please sign in to comment.