Skip to content

Commit

Permalink
Merge branch 'master' into snyk-upgrade-53d83998ed92fa6e4d886285369cd81e
Browse files Browse the repository at this point in the history
  • Loading branch information
@INexizI
INexizI authored Jul 25, 2024
2 parents 0bc7cdf + 507ad8e commit a3b367f
Show file tree
Hide file tree
Showing 5 changed files with 1,077 additions and 1,026 deletions.
12 changes: 6 additions & 6 deletions Gemfile
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ git_source(:github) { |repo| "https://github.com/#{repo}.git" }

ruby '3.1.3'

gem 'rails', '~> 7.1.3', '>= 7.1.3.1'
gem 'rails', '~> 7.1.3', '>= 7.1.3.4'
gem 'pg'
gem 'puma', '>= 6.4.2'
gem 'bootsnap', require: false
Expand All @@ -22,7 +22,7 @@ gem 'meta-tags', '>= 2.21.0'

gem 'ransack', :github => 'activerecord-hackery/ransack', :branch => 'main'
gem 'slim-rails', '>= 3.6.3'
gem 'simple_form', '>= 5.3.0'
gem 'simple_form', '>= 5.3.1'
gem 'friendly_id'
# gem 'mini_magick'
# gem 'carrierwave'
Expand All @@ -32,7 +32,7 @@ gem 'rack-cors'
gem 'rubyzip'
gem 'uglifier'

gem 'turbo-rails', '~> 1.1.0'
gem 'turbo-rails', '~> 1.3.0'

gem 'nokogiri', '~> 1.16'

Expand All @@ -43,7 +43,7 @@ gem 'elasticsearch-persistence'
group :development, :test do
gem 'byebug', platforms: [:mri, :mingw, :x64_mingw]
gem 'brakeman'
gem 'rspec-rails', '~> 6.0.3.0'
gem 'rspec-rails', '~> 6.0.4.0'
gem 'rails-controller-testing'
end

Expand All @@ -56,8 +56,8 @@ end

group :test do
gem 'capybara', '>= 3.40.0'
gem 'selenium-webdriver'
gem 'webdrivers'
gem 'selenium-webdriver', '>= 4.11.0'
gem 'webdrivers', '>= 5.3.0'
gem 'shoulda-matchers'
end

Expand Down
156 changes: 78 additions & 78 deletions Gemfile.lock
View file
Original file line number Diff line number Diff line change
Expand Up @@ -11,71 +11,71 @@ GIT
GEM
remote: https://rubygems.org/
specs:
actioncable (7.1.3.2)
actionpack (= 7.1.3.2)
activesupport (= 7.1.3.2)
actioncable (7.1.3.4)
actionpack (= 7.1.3.4)
activesupport (= 7.1.3.4)
nio4r (~> 2.0)
websocket-driver (>= 0.6.1)
zeitwerk (~> 2.6)
actionmailbox (7.1.3.2)
actionpack (= 7.1.3.2)
activejob (= 7.1.3.2)
activerecord (= 7.1.3.2)
activestorage (= 7.1.3.2)
activesupport (= 7.1.3.2)
actionmailbox (7.1.3.4)
actionpack (= 7.1.3.4)
activejob (= 7.1.3.4)
activerecord (= 7.1.3.4)
activestorage (= 7.1.3.4)
activesupport (= 7.1.3.4)
mail (>= 2.7.1)
net-imap
net-pop
net-smtp
actionmailer (7.1.3.2)
actionpack (= 7.1.3.2)
actionview (= 7.1.3.2)
activejob (= 7.1.3.2)
activesupport (= 7.1.3.2)
actionmailer (7.1.3.4)
actionpack (= 7.1.3.4)
actionview (= 7.1.3.4)
activejob (= 7.1.3.4)
activesupport (= 7.1.3.4)
mail (~> 2.5, >= 2.5.4)
net-imap
net-pop
net-smtp
rails-dom-testing (~> 2.2)
actionpack (7.1.3.2)
actionview (= 7.1.3.2)
activesupport (= 7.1.3.2)
actionpack (7.1.3.4)
actionview (= 7.1.3.4)
activesupport (= 7.1.3.4)
nokogiri (>= 1.8.5)
racc
rack (>= 2.2.4)
rack-session (>= 1.0.1)
rack-test (>= 0.6.3)
rails-dom-testing (~> 2.2)
rails-html-sanitizer (~> 1.6)
actiontext (7.1.3.2)
actionpack (= 7.1.3.2)
activerecord (= 7.1.3.2)
activestorage (= 7.1.3.2)
activesupport (= 7.1.3.2)
actiontext (7.1.3.4)
actionpack (= 7.1.3.4)
activerecord (= 7.1.3.4)
activestorage (= 7.1.3.4)
activesupport (= 7.1.3.4)
globalid (>= 0.6.0)
nokogiri (>= 1.8.5)
actionview (7.1.3.2)
activesupport (= 7.1.3.2)
actionview (7.1.3.4)
activesupport (= 7.1.3.4)
builder (~> 3.1)
erubi (~> 1.11)
rails-dom-testing (~> 2.2)
rails-html-sanitizer (~> 1.6)
activejob (7.1.3.2)
activesupport (= 7.1.3.2)
activejob (7.1.3.4)
activesupport (= 7.1.3.4)
globalid (>= 0.3.6)
activemodel (7.1.3.2)
activesupport (= 7.1.3.2)
activerecord (7.1.3.2)
activemodel (= 7.1.3.2)
activesupport (= 7.1.3.2)
activemodel (7.1.3.4)
activesupport (= 7.1.3.4)
activerecord (7.1.3.4)
activemodel (= 7.1.3.4)
activesupport (= 7.1.3.4)
timeout (>= 0.4.0)
activestorage (7.1.3.2)
actionpack (= 7.1.3.2)
activejob (= 7.1.3.2)
activerecord (= 7.1.3.2)
activesupport (= 7.1.3.2)
activestorage (7.1.3.4)
actionpack (= 7.1.3.4)
activejob (= 7.1.3.4)
activerecord (= 7.1.3.4)
activesupport (= 7.1.3.4)
marcel (~> 1.0)
activesupport (7.1.3.2)
activesupport (7.1.3.4)
base64
bigdecimal
concurrent-ruby (~> 1.0, >= 1.0.2)
Expand All @@ -90,12 +90,12 @@ GEM
addressable (2.8.6)
public_suffix (>= 2.0.2, < 6.0)
base64 (0.2.0)
bigdecimal (3.1.7)
bigdecimal (3.1.8)
bindex (0.8.1)
bootsnap (1.16.0)
msgpack (~> 1.2)
brakeman (6.0.0)
builder (3.2.4)
builder (3.3.0)
byebug (11.1.3)
capybara (3.40.0)
addressable
Expand All @@ -106,7 +106,7 @@ GEM
rack-test (>= 0.6.3)
regexp_parser (>= 1.5, < 3.0)
xpath (~> 3.2)
concurrent-ruby (1.2.3)
concurrent-ruby (1.3.3)
connection_pool (2.4.1)
crass (1.0.6)
cssbundling-rails (1.4.0)
Expand Down Expand Up @@ -168,11 +168,11 @@ GEM
rails (>= 6.0.0)
stimulus-rails
turbo-rails
i18n (1.14.4)
i18n (1.14.5)
concurrent-ruby (~> 1.0)
io-console (0.7.2)
irb (1.11.2)
rdoc
irb (1.13.1)
rdoc (>= 4.0.0)
reline (>= 0.4.2)
jbuilder (2.11.5)
actionview (>= 5.0.0)
Expand All @@ -191,26 +191,26 @@ GEM
net-imap
net-pop
net-smtp
marcel (1.0.2)
marcel (1.0.4)
matrix (0.4.2)
meta-tags (2.21.0)
actionpack (>= 6.0.0, < 7.2)
mini_mime (1.1.5)
minitest (5.22.3)
minitest (5.23.1)
msgpack (1.7.1)
multi_json (1.15.0)
multipart-post (2.3.0)
mutex_m (0.2.0)
net-imap (0.4.10)
net-imap (0.4.12)
date
net-protocol
net-pop (0.1.2)
net-protocol
net-protocol (0.2.2)
timeout
net-smtp (0.4.0.1)
net-smtp (0.5.0)
net-protocol
nio4r (2.7.0)
nio4r (2.7.3)
nokogiri (1.16.5-x86_64-linux)
racc (~> 1.4)
pg (1.5.3)
Expand All @@ -219,7 +219,7 @@ GEM
public_suffix (5.0.4)
puma (6.4.2)
nio4r (~> 2.0)
racc (1.7.3)
racc (1.8.0)
rack (2.2.9)
rack-cors (2.0.2)
rack (>= 2.0.0)
Expand All @@ -230,20 +230,20 @@ GEM
rackup (1.0.0)
rack (< 3)
webrick
rails (7.1.3.2)
actioncable (= 7.1.3.2)
actionmailbox (= 7.1.3.2)
actionmailer (= 7.1.3.2)
actionpack (= 7.1.3.2)
actiontext (= 7.1.3.2)
actionview (= 7.1.3.2)
activejob (= 7.1.3.2)
activemodel (= 7.1.3.2)
activerecord (= 7.1.3.2)
activestorage (= 7.1.3.2)
activesupport (= 7.1.3.2)
rails (7.1.3.4)
actioncable (= 7.1.3.4)
actionmailbox (= 7.1.3.4)
actionmailer (= 7.1.3.4)
actionpack (= 7.1.3.4)
actiontext (= 7.1.3.4)
actionview (= 7.1.3.4)
activejob (= 7.1.3.4)
activemodel (= 7.1.3.4)
activerecord (= 7.1.3.4)
activestorage (= 7.1.3.4)
activesupport (= 7.1.3.4)
bundler (>= 1.15.0)
railties (= 7.1.3.2)
railties (= 7.1.3.4)
rails-controller-testing (1.0.5)
actionpack (>= 5.0.1.rc1)
actionview (>= 5.0.1.rc1)
Expand All @@ -255,19 +255,19 @@ GEM
rails-html-sanitizer (1.6.0)
loofah (~> 2.21)
nokogiri (~> 1.14)
railties (7.1.3.2)
actionpack (= 7.1.3.2)
activesupport (= 7.1.3.2)
railties (7.1.3.4)
actionpack (= 7.1.3.4)
activesupport (= 7.1.3.4)
irb
rackup (>= 1.0.0)
rake (>= 12.2)
thor (~> 1.0, >= 1.2.2)
zeitwerk (~> 2.6)
rake (13.1.0)
rake (13.2.1)
rb-fsevent (0.11.2)
rb-inotify (0.10.1)
ffi (~> 1.0)
rdoc (6.6.3.1)
rdoc (6.7.0)
psych (>= 4.0.0)
redis (5.0.6)
redis-client (>= 0.9.0)
Expand All @@ -292,7 +292,7 @@ GEM
redis-store (1.9.2)
redis (>= 4, < 6)
regexp_parser (2.9.0)
reline (0.4.3)
reline (0.5.9)
io-console (~> 0.5)
rexml (3.2.8)
strscan (>= 3.0.9)
Expand All @@ -301,10 +301,10 @@ GEM
rspec-expectations (3.13.0)
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.0.3)
rspec-rails (6.0.4)
actionpack (>= 6.1)
activesupport (>= 6.1)
railties (>= 6.1)
Expand Down Expand Up @@ -336,7 +336,7 @@ GEM
connection_pool (>= 2.3.0)
rack (>= 2.2.4)
redis-client (>= 0.19.0)
simple_form (5.3.0)
simple_form (5.3.1)
actionpack (>= 5.2)
activemodel (>= 5.2)
slim (5.1.1)
Expand All @@ -358,10 +358,10 @@ GEM
stringio (3.1.0)
strscan (3.1.0)
temple (0.10.3)
thor (1.3.0)
thor (1.3.1)
tilt (2.3.0)
timeout (0.4.1)
turbo-rails (1.1.1)
turbo-rails (1.3.3)
actionpack (>= 6.0.0)
activejob (>= 6.0.0)
railties (>= 6.0.0)
Expand All @@ -385,7 +385,7 @@ GEM
websocket-extensions (0.1.5)
xpath (3.2.0)
nokogiri (~> 1.8)
zeitwerk (2.6.13)
zeitwerk (2.6.15)

PLATFORMS
x86_64-linux
Expand All @@ -411,21 +411,21 @@ DEPENDENCIES
pg
puma (>= 6.4.2)
rack-cors
rails (~> 7.1.3, >= 7.1.3.1)
rails (~> 7.1.3, >= 7.1.3.4)
rails-controller-testing
ransack!
redis
redis-namespace
redis-rails (>= 5.0.2)
rspec-rails (~> 6.0.3.0)
rspec-rails (~> 6.0.4.0)
rubyzip
sass-rails (>= 6.0.0)
selenium-webdriver
shoulda-matchers
sidekiq (>= 7.2.4)
simple_form (>= 5.3.0)
simple_form (>= 5.3.1)
slim-rails (>= 3.6.3)
turbo-rails (~> 1.1.0)
turbo-rails (~> 1.3.0)
tzinfo-data
uglifier
web-console (>= 4.2.1)
Expand Down
Loading

0 comments on commit a3b367f

Please sign in to comment.