Skip to content

Commit

Permalink
Merge branch 'development' into bootstrap-5.3
Browse files Browse the repository at this point in the history
  • Loading branch information
skyporter authored May 14, 2024
2 parents f45f626 + 572cf99 commit 59bb6e9
Show file tree
Hide file tree
Showing 2 changed files with 6 additions and 6 deletions.
2 changes: 1 addition & 1 deletion Gemfile
Original file line number Diff line number Diff line change
Expand Up @@ -50,7 +50,7 @@ gem 'sassc-rails', "~> 2.1"
gem "secure_headers", "~> 6.3"
gem "select2-rails", "~> 4.0"
gem "shakapacker", "7.1"
gem "sidekiq", "~> 7.1"
gem "sidekiq", "~> 7.2"
gem "sinatra", "~> 3.1"
gem "sprockets", "~> 4.0"
gem "summernote-rails", "~> 0.8"
Expand Down
10 changes: 5 additions & 5 deletions Gemfile.lock
Original file line number Diff line number Diff line change
Expand Up @@ -382,7 +382,7 @@ GEM
pundit (2.3.1)
activesupport (>= 3.0.0)
racc (1.7.3)
rack (2.2.8.1)
rack (2.2.9)
rack-protection (3.1.0)
rack (~> 2.2, >= 2.2.4)
rack-proxy (0.7.7)
Expand Down Expand Up @@ -443,7 +443,7 @@ GEM
redcarpet (3.6.0)
redis (5.0.8)
redis-client (>= 0.17.0)
redis-client (0.18.0)
redis-client (0.22.1)
connection_pool
regexp_parser (2.8.2)
reline (0.4.3)
Expand Down Expand Up @@ -531,11 +531,11 @@ GEM
shoulda-context (2.0.0)
shoulda-matchers (5.3.0)
activesupport (>= 5.2.0)
sidekiq (7.2.0)
sidekiq (7.2.4)
concurrent-ruby (< 2)
connection_pool (>= 2.3.0)
rack (>= 2.2.4)
redis-client (>= 0.14.0)
redis-client (>= 0.19.0)
simplecov (0.22.0)
docile (~> 1.1)
simplecov-html (~> 0.11)
Expand Down Expand Up @@ -686,7 +686,7 @@ DEPENDENCIES
shakapacker (= 7.1)
shoulda-context (~> 2.0)
shoulda-matchers (~> 5.1)
sidekiq (~> 7.1)
sidekiq (~> 7.2)
simplecov (~> 0.22)
sinatra (~> 3.1)
spring (~> 4.1)
Expand Down

0 comments on commit 59bb6e9

Please sign in to comment.