Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[update-3] Bundle update & npm update #513

Merged
merged 2 commits into from
Nov 26, 2024
Merged

[update-3] Bundle update & npm update #513

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
62bd511
[update-3] Bundle update & npm update
brand-it Nov 26, 2024
d7ba975
Merge branch 'main' into bundle-update-3
brand-it Nov 26, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion Gemfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ gem 'kaminari'
gem 'net-ftp'
gem 'os'
gem 'progressbar'
gem 'puma', git: 'https://github.com/puma/puma'
gem 'puma'
gem 'rails'
gem 'rainbow'
gem 'sass-rails'
Expand Down
61 changes: 29 additions & 32 deletions Gemfile.lock
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,10 +1,3 @@
GIT
remote: https://github.com/puma/puma
revision: 271e4d0b697aabb022de1daa4a6f425f416cfafe
specs:
puma (6.4.3)
nio4r (~> 2.0)

GEM
remote: https://rubygems.org/
specs:
Expand Down Expand Up @@ -152,17 +145,17 @@ GEM
railties (>= 5.0.0)
faker (3.5.1)
i18n (>= 1.8.11, < 2)
faraday (2.12.0)
faraday-net_http (>= 2.0, < 3.4)
faraday (2.12.1)
faraday-net_http (>= 2.0, < 3.5)
json
logger
faraday-net_http (3.3.0)
net-http
faraday-net_http (3.4.0)
net-http (>= 0.5.0)
ffi (1.17.0)
flamegraph (0.9.5)
globalid (1.2.1)
activesupport (>= 6.1)
hashdiff (1.1.1)
hashdiff (1.1.2)
hotwire-rails (0.1.3)
rails (>= 6.0.0)
stimulus-rails
Expand All @@ -179,7 +172,7 @@ GEM
activesupport (>= 5.0.0)
jsbundling-rails (1.3.1)
railties (>= 6.0.0)
json (2.8.1)
json (2.8.2)
kaminari (1.2.2)
activesupport (>= 4.1.0)
kaminari-actionview (= 1.2.2)
Expand Down Expand Up @@ -210,15 +203,15 @@ GEM
memory_profiler (1.1.0)
method_source (1.1.0)
mini_mime (1.1.5)
mini_portile2 (2.8.7)
minitest (5.25.1)
msgpack (1.7.3)
mini_portile2 (2.8.8)
minitest (5.25.2)
msgpack (1.7.5)
net-ftp (0.3.8)
net-protocol
time
net-http (0.5.0)
uri
net-imap (0.5.0)
net-imap (0.5.1)
date
net-protocol
net-pop (0.1.2)
Expand All @@ -232,7 +225,7 @@ GEM
mini_portile2 (~> 2.8.2)
racc (~> 1.4)
observer (0.1.2)
optimist (3.1.0)
optimist (3.2.0)
os (1.1.4)
package_json (0.1.0)
parallel (1.26.3)
Expand All @@ -245,6 +238,8 @@ GEM
psych (5.2.0)
stringio
public_suffix (6.0.1)
puma (6.5.0)
nio4r (~> 2.0)
racc (1.8.1)
rack (3.1.8)
rack-mini-profiler (3.3.1)
Expand All @@ -255,7 +250,7 @@ GEM
rack (>= 3.0.0)
rack-test (2.1.0)
rack (>= 1.3)
rackup (2.2.0)
rackup (2.2.1)
rack (>= 3)
rails (7.2.2)
actioncable (= 7.2.2)
Expand Down Expand Up @@ -291,7 +286,7 @@ GEM
rb-fsevent (0.11.2)
rb-inotify (0.11.1)
ffi (~> 1.0)
rdoc (6.7.0)
rdoc (6.8.1)
psych (>= 4.0.0)
regexp_parser (2.9.2)
reline (0.5.11)
Expand All @@ -307,7 +302,7 @@ GEM
rspec-mocks (3.13.2)
diff-lcs (>= 1.2.0, < 2.0)
rspec-support (~> 3.13.0)
rspec-rails (7.0.1)
rspec-rails (7.1.0)
actionpack (>= 7.0)
activesupport (>= 7.0)
railties (>= 7.0)
Expand All @@ -316,21 +311,21 @@ GEM
rspec-mocks (~> 3.13)
rspec-support (~> 3.13)
rspec-support (3.13.1)
rubocop (1.68.0)
rubocop (1.69.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 (>= 2.4, < 3.0)
rubocop-ast (>= 1.32.2, < 2.0)
rubocop-ast (>= 1.36.1, < 2.0)
ruby-progressbar (~> 1.7)
unicode-display_width (>= 2.4.0, < 3.0)
rubocop-ast (1.34.1)
unicode-display_width (>= 2.4.0, < 4.0)
rubocop-ast (1.36.1)
parser (>= 3.3.1.0)
rubocop-capybara (2.21.0)
rubocop (~> 1.41)
rubocop-discourse (3.8.5)
rubocop-discourse (3.8.6)
activesupport (>= 6.1)
rubocop (>= 1.59.0)
rubocop-capybara (>= 2.0.0)
Expand Down Expand Up @@ -362,7 +357,7 @@ GEM
sprockets (> 3.0)
sprockets-rails
tilt
securerandom (0.3.1)
securerandom (0.3.2)
selenium-webdriver (4.10.0)
rexml (~> 3.2, >= 3.2.5)
rubyzip (>= 1.2.2, < 3.0)
Expand All @@ -388,13 +383,13 @@ GEM
actionpack (>= 6.1)
activesupport (>= 6.1)
sprockets (>= 3.0.0)
sqlite3 (2.2.0)
sqlite3 (2.3.1)
mini_portile2 (~> 2.8.0)
stackprof (0.2.26)
stimulus-rails (1.3.4)
railties (>= 6.0.0)
stringio (3.1.2)
super_diff (0.13.0)
super_diff (0.14.0)
attr_extras (>= 6.2.4)
diff-lcs
patience_diff
Expand All @@ -413,8 +408,10 @@ GEM
railties (>= 6.0.0)
tzinfo (2.0.6)
concurrent-ruby (~> 1.0)
unicode-display_width (2.6.0)
uri (1.0.1)
unicode-display_width (3.1.2)
unicode-emoji (~> 4.0, >= 4.0.4)
unicode-emoji (4.0.4)
uri (1.0.2)
useragent (0.16.10)
vcr (6.3.1)
base64
Expand Down Expand Up @@ -471,7 +468,7 @@ DEPENDENCIES
net-ftp
os
progressbar
puma!
puma
rack-mini-profiler
rails
rainbow
Expand Down
Loading
Loading