Skip to content

Commit

Permalink
Merge branch 'main' into inactivating-vendors-issue-4949
Browse files Browse the repository at this point in the history
  • Loading branch information
jorgedjr21 authored Feb 3, 2025
2 parents 333668e + f6fa554 commit fb64c5b
Show file tree
Hide file tree
Showing 2 changed files with 27 additions and 27 deletions.
4 changes: 2 additions & 2 deletions Gemfile
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ end
# User management and login workflow.
gem "devise", '>= 4.7.1'
# Postgres database adapter.
gem "pg", "~> 1.5.7"
gem "pg", "~> 1.5.9"
# Web server.
gem "puma"
# Rails web framework.
Expand All @@ -24,7 +24,7 @@ gem 'azure-storage-blob'
# Adds soft delete functionality for models.
gem 'discard', '~> 1.3'
# Adds grouping by date/month/etc to queries.
gem "groupdate", "~> 6.4"
gem "groupdate", "~> 6.5"
# Treats attributes like money, which knows about dollars and cents.
gem "money-rails"
# Tracks history / audits models.
Expand Down
50 changes: 25 additions & 25 deletions Gemfile.lock
Original file line number Diff line number Diff line change
Expand Up @@ -115,12 +115,12 @@ GEM
autoprefixer-rails (>= 9.1.0)
popper_js (>= 2.11.6, < 3)
sassc-rails (>= 2.0.0)
brakeman (6.2.1)
brakeman (7.0.0)
racc
bugsnag (6.27.1)
concurrent-ruby (~> 1.0)
builder (3.3.0)
bullet (7.2.0)
bullet (8.0.0)
activesupport (>= 3.0.0)
uniform_notifier (~> 1.11)
capybara (3.40.0)
Expand All @@ -141,13 +141,13 @@ GEM
activesupport
tzinfo
coderay (1.1.3)
concurrent-ruby (1.3.4)
connection_pool (2.4.1)
concurrent-ruby (1.3.5)
connection_pool (2.5.0)
crack (1.0.0)
bigdecimal
rexml
crass (1.0.6)
csv (3.3.0)
csv (3.3.2)
cuprite (0.15.1)
capybara (~> 3.0)
ferrum (~> 0.15.0)
Expand Down Expand Up @@ -272,13 +272,13 @@ GEM
sanitize (< 7)
foreman (0.88.1)
formatador (1.1.0)
geocoder (1.8.3)
geocoder (1.8.5)
base64 (>= 0.1.0)
csv (>= 3.0.0)
globalid (1.2.1)
activesupport (>= 6.1)
groupdate (6.4.0)
activesupport (>= 6.1)
groupdate (6.5.1)
activesupport (>= 7)
guard (2.18.0)
formatador (>= 0.2.4)
listen (>= 2.7, < 4.0)
Expand All @@ -300,7 +300,7 @@ GEM
csv
mini_mime (>= 1.0.0)
multi_xml (>= 0.5.2)
i18n (1.14.6)
i18n (1.14.7)
concurrent-ruby (~> 1.0)
icalendar (2.10.3)
ice_cube (~> 0.16)
Expand Down Expand Up @@ -338,7 +338,7 @@ GEM
kaminari-core (1.2.2)
knapsack_pro (7.13.1)
rake
language_server-protocol (3.17.0.3)
language_server-protocol (3.17.0.4)
launchy (3.0.0)
addressable (~> 2.8)
childprocess (~> 5.0)
Expand All @@ -348,7 +348,7 @@ GEM
listen (3.9.0)
rb-fsevent (~> 0.10, >= 0.10.3)
rb-inotify (~> 0.9, >= 0.9.10)
logger (1.6.4)
logger (1.6.5)
lograge (0.14.0)
actionpack (>= 4)
activesupport (>= 4)
Expand Down Expand Up @@ -448,7 +448,7 @@ GEM
activerecord (>= 6.1)
request_store (~> 1.4)
parallel (1.26.3)
parser (3.3.6.0)
parser (3.3.7.0)
ast (~> 2.4.1)
racc
pdf-core (0.10.0)
Expand All @@ -458,7 +458,7 @@ GEM
hashery (~> 2.0)
ruby-rc4
ttfunk
pg (1.5.7)
pg (1.5.9)
popper_js (2.11.8)
prawn (2.5.0)
matrix (~> 0.4)
Expand Down Expand Up @@ -491,7 +491,7 @@ GEM
date
stringio
public_suffix (6.0.1)
puma (6.5.0)
puma (6.6.0)
nio4r (~> 2.0)
racc (1.8.1)
rack (3.1.8)
Expand Down Expand Up @@ -551,8 +551,8 @@ GEM
ffi (~> 1.0)
rdoc (6.10.0)
psych (>= 4.0.0)
recaptcha (5.17.0)
regexp_parser (2.9.3)
recaptcha (5.19.0)
regexp_parser (2.10.0)
reline (0.6.0)
io-console (~> 0.5)
request_store (1.7.0)
Expand Down Expand Up @@ -584,7 +584,7 @@ GEM
rspec-mocks (~> 3.13)
rspec-support (~> 3.13)
rspec-support (3.13.2)
rubocop (1.69.2)
rubocop (1.70.0)
json (~> 2.3)
language_server-protocol (>= 3.17.0)
parallel (~> 1.10)
Expand All @@ -594,9 +594,9 @@ GEM
rubocop-ast (>= 1.36.2, < 2.0)
ruby-progressbar (~> 1.7)
unicode-display_width (>= 2.4.0, < 4.0)
rubocop-ast (1.37.0)
rubocop-ast (1.38.0)
parser (>= 3.3.1.0)
rubocop-performance (1.23.0)
rubocop-performance (1.23.1)
rubocop (>= 1.48.1, < 2.0)
rubocop-ast (>= 1.31.1, < 2.0)
rubocop-rails (2.25.1)
Expand Down Expand Up @@ -661,10 +661,10 @@ GEM
activesupport (>= 5.2)
sprockets (>= 3.0.0)
stackprof (0.2.27)
standard (1.43.0)
standard (1.44.0)
language_server-protocol (~> 3.17.0.2)
lint_roller (~> 1.0)
rubocop (~> 1.69.1)
rubocop (~> 1.70.0)
standard-custom (~> 1.0.0)
standard-performance (~> 1.6)
standard-custom (1.0.2)
Expand All @@ -681,7 +681,7 @@ GEM
stringio (3.1.2)
strong_migrations (1.8.0)
activerecord (>= 5.2)
terser (1.2.4)
terser (1.2.5)
execjs (>= 0.3.0, < 3)
thor (1.3.2)
tilt (2.2.0)
Expand All @@ -693,7 +693,7 @@ GEM
railties (>= 6.0.0)
tzinfo (2.0.6)
concurrent-ruby (~> 1.0)
unicode-display_width (3.1.2)
unicode-display_width (3.1.4)
unicode-emoji (~> 4.0, >= 4.0.4)
unicode-emoji (4.0.4)
uniform_notifier (1.16.0)
Expand Down Expand Up @@ -764,7 +764,7 @@ DEPENDENCIES
flipper-ui
foreman
geocoder
groupdate (~> 6.4)
groupdate (~> 6.5)
guard-rspec
httparty
icalendar
Expand All @@ -789,7 +789,7 @@ DEPENDENCIES
orderly (~> 0.1)
paper_trail
pdf-reader
pg (~> 1.5.7)
pg (~> 1.5.9)
prawn-rails
pry-doc
pry-nav
Expand Down

0 comments on commit fb64c5b

Please sign in to comment.