Skip to content

Commit

Permalink
Merge branch 'main' into nj-97-income_eligibility
Browse files Browse the repository at this point in the history
  • Loading branch information
mluedke2 committed Nov 6, 2024
2 parents 0b8f9cd + 182cd4b commit 8e8ece4
Show file tree
Hide file tree
Showing 107 changed files with 1,865 additions and 330 deletions.
2 changes: 1 addition & 1 deletion Gemfile
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ gem 'rack', '>= 2.0.8'
gem 'rails', '~> 7.1'
gem 'puma', '>= 5.3.2'
gem 'sass-rails', '~> 5.0'
gem 'cfa-styleguide', '0.10.5', git: 'https://github.com/codeforamerica/honeycrisp-gem', branch: 'main', ref: '4c6f873f55704ec34fd518906f131133b290e56a'
gem 'cfa-styleguide', '0.15.2', git: 'https://github.com/codeforamerica/honeycrisp-gem', branch: 'main', ref: '64379cc8e7cf77ed68a98e226146405864ab49b5'
gem 'nokogiri', '>= 1.10.8'
gem 'recaptcha'
gem "activerecord-cte" # Can be removed when we move to Rails 7.1
Expand Down
10 changes: 5 additions & 5 deletions Gemfile.lock
Original file line number Diff line number Diff line change
@@ -1,10 +1,10 @@
GIT
remote: https://github.com/codeforamerica/honeycrisp-gem
revision: 4c6f873f55704ec34fd518906f131133b290e56a
ref: 4c6f873f55704ec34fd518906f131133b290e56a
revision: 64379cc8e7cf77ed68a98e226146405864ab49b5
ref: 64379cc8e7cf77ed68a98e226146405864ab49b5
branch: main
specs:
cfa-styleguide (0.10.5)
cfa-styleguide (0.15.2)
autoprefixer-rails
bourbon
jquery-rails
Expand Down Expand Up @@ -104,7 +104,7 @@ GEM
ast (2.4.2)
auto_strip_attributes (2.6.0)
activerecord (>= 4.0)
autoprefixer-rails (10.4.15.0)
autoprefixer-rails (10.4.19.0)
execjs (~> 2)
awesome_print (1.9.2)
aws-eventstream (1.2.0)
Expand Down Expand Up @@ -741,7 +741,7 @@ DEPENDENCIES
byebug
cancancan
capybara (>= 2.15)
cfa-styleguide (= 0.10.5)!
cfa-styleguide (= 0.15.2)!
combine_pdf
data_migrate
database_cleaner
Expand Down
Loading

0 comments on commit 8e8ece4

Please sign in to comment.