Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
39 commits
Select commit Hold shift + click to select a range
a777b3a
pre-fill Cx Collection Detail if using an A11 form
ryanwoldatwork Feb 5, 2025
6929f2a
return the start and end dates for a fiscal year and quarter
ryanwoldatwork Feb 6, 2025
bd77877
add CxCollectionDetail.form_id
ryanwoldatwork Feb 6, 2025
c0bb844
wip - create CxResponses from Form responses
ryanwoldatwork Feb 6, 2025
8eed195
integers for fy and quarter
ryanwoldatwork Feb 6, 2025
58e68f8
fill in date field with DD/MM/YYYY
ryanwoldatwork Feb 6, 2025
651ffce
on
ryanwoldatwork Feb 6, 2025
ee4719e
Merge branch 'develop' into automate-quarterly-cx-reporting-for-a11
ryanwoldatwork Apr 3, 2025
54fa60b
Bump pbkdf2 from 3.1.2 to 3.1.3
dependabot[bot] Jun 24, 2025
a65f40d
fix: Gemfile to reduce vulnerabilities
snyk-bot Jul 17, 2025
54ccfe4
initial updates for 30 questions
MrNagoo Jul 18, 2025
ec1ecab
update test config
MrNagoo Jul 21, 2025
e01183b
update max question logic and test
MrNagoo Jul 21, 2025
1b852bd
test config
MrNagoo Jul 21, 2025
8893c5e
Remove redundant id's and aria-label attributes
jhutchison-nava Jul 22, 2025
37383ea
fix: Gemfile to reduce vulnerabilities
snyk-bot Jul 24, 2025
c4a20ec
Merge pull request #1873 from GSA/snyk-fix-2afae4ba3191505089d6211236…
rileyseaburg Jul 28, 2025
c85e462
Merge branch 'develop' into increase-max-answer-count
rileyseaburg Jul 28, 2025
51c13d8
Bump nokogiri from 1.18.8 to 1.18.9
dependabot[bot] Jul 28, 2025
e9abf64
Bump thor from 1.3.2 to 1.4.0
dependabot[bot] Jul 28, 2025
2c91806
Merge pull request #1869 from GSA/increase-max-answer-count
rileyseaburg Jul 29, 2025
e144bdd
Merge pull request #1874 from GSA/dependabot/bundler/nokogiri-1.18.9
rileyseaburg Jul 29, 2025
b5260c5
Merge pull request #1875 from GSA/dependabot/bundler/thor-1.4.0
rileyseaburg Jul 29, 2025
fc7d086
Merge pull request #1871 from jhutchison-nava/jhutchison-nava-patch-1
rileyseaburg Jul 29, 2025
ce3bd29
Merge branch 'develop' into snyk-fix-7fac8a0c3c9b6f5ad68c0fb095784e68
rileyseaburg Jul 29, 2025
8cc6815
Upgrade dependencies
MrNagoo Aug 1, 2025
5b7affe
update form test
rileyseaburg Aug 11, 2025
9d62a81
update question limit validation to allow exactly 30 questions
rileyseaburg Aug 11, 2025
6a75170
Merge pull request #1881 from GSA/feature/fix-form-test-max-number
rileyseaburg Aug 11, 2025
1d6ce2b
Merge pull request #1878 from GSA/secure-upgrades
rileyseaburg Aug 11, 2025
1ace54a
Merge pull request #1866 from GSA/dependabot/npm_and_yarn/pbkdf2-3.1.3
rileyseaburg Aug 11, 2025
8f7f528
Merge pull request #1868 from GSA/snyk-fix-7fac8a0c3c9b6f5ad68c0fb095…
rileyseaburg Aug 11, 2025
b412629
Merge branch 'develop' into automate-quarterly-cx-reporting-for-a11
rileyseaburg Aug 11, 2025
04c6ae5
Update lib/fiscal_year.rb
rileyseaburg Aug 11, 2025
b8e298c
Update app/models/cx_collection_detail_upload.rb
rileyseaburg Aug 11, 2025
fe8d4b1
Update app/controllers/admin/cx_collection_details_controller.rb
rileyseaburg Aug 11, 2025
6cd5186
Update app/controllers/admin/cx_collection_details_controller.rb
rileyseaburg Aug 11, 2025
b4886e4
Update app/views/admin/cx_collection_details/upload.html.erb
rileyseaburg Aug 11, 2025
ed0ad71
Merge pull request #1768 from GSA/automate-quarterly-cx-reporting-for…
rileyseaburg Aug 11, 2025
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
52 changes: 28 additions & 24 deletions Gemfile
Original file line number Diff line number Diff line change
Expand Up @@ -4,25 +4,25 @@ git_source(:github) { |repo| "https://github.com/#{repo}.git" }
ruby '3.3.4'

# Bundle edge Rails instead: gem "rails", github: "rails/rails", branch: "main"
gem "rails", "~> 8.0"
gem 'rails', '~> 8.0'

# The original asset pipeline for Rails [https://github.com/rails/sprockets-rails]
gem "sprockets-rails"
gem 'sprockets-rails'

# Use postgresql as the database for Active Record
gem "pg"
gem 'pg'

# Use the Puma web server [https://github.com/puma/puma]
gem "puma"
gem 'puma'

# Use JavaScript with ESM import maps [https://github.com/rails/importmap-rails]
gem "importmap-rails", ">= 2.0.0"

gem "importmap-rails", ">= 2.2.0"

# Hotwire"s SPA-like page accelerator [https://turbo.hotwired.dev]
gem "turbo-rails"
gem "turbo-rails", ">= 2.0.14"

# Hotwire"s modest JavaScript framework [https://stimulus.hotwired.dev]
gem "stimulus-rails"
gem 'stimulus-rails'

# Use Kredis to get higher-level data types in Redis [https://github.com/rails/kredis]
# gem "kredis"
Expand All @@ -31,16 +31,16 @@ gem "stimulus-rails"
# gem "bcrypt", "~> 3.1.7"

# Windows does not include zoneinfo files, so bundle the tzinfo-data gem
gem "tzinfo-data", platforms: %i[mingw mswin x64_mingw jruby]
gem 'tzinfo-data', platforms: %i[mingw mswin x64_mingw jruby]

# Reduces boot times through caching; required in config/boot.rb
gem "bootsnap", require: false
gem 'bootsnap', require: false

# Use Sass to process CSS
gem "sassc-rails"
gem 'sassc-rails'

# Use Active Storage variants [https://guides.rubyonrails.org/active_storage_overview.html#transforming-images]
gem "image_processing", "~> 1.12"
gem 'image_processing', '~> 1.12'

gem 'active_model_serializers'
gem 'acts-as-list'
Expand All @@ -51,7 +51,7 @@ gem 'carrierwave', '>= 2.2.1'
gem 'csv'
gem 'devise', '>= 4.8.1'
gem 'fog-aws', '>= 3.15.0'
gem "jbuilder"
gem 'jbuilder'
gem 'jquery-rails'
gem 'kaminari'
gem 'kramdown'
Expand All @@ -62,35 +62,39 @@ gem 'omniauth-github'
gem 'omniauth_login_dot_gov', git: 'https://github.com/18F/omniauth_login_dot_gov.git', branch: 'main'
gem 'omniauth-rails_csrf_protection'
gem 'rack-attack'
gem 'rack-cors', require: 'rack/cors'
# Use Redis to cache Touchpoints in all envs
gem 'rack-cors', '>= 3.0.0', require: 'rack/cors'
# Use Redis to cache Touchpoints in all envs=
Copy link

Copilot AI Aug 11, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

There's an extra '=' character at the end of the comment line.

Suggested change
# Use Redis to cache Touchpoints in all envs=
# Use Redis to cache Touchpoints in all envs

Copilot uses AI. Check for mistakes.
gem 'redis-client'
gem 'redis-namespace'
gem 'sidekiq', '>= 6.5.0'
gem 'sidekiq', '>= 8.0.4'
gem 'json-jwt'
gem 'aasm'
gem 'acts-as-taggable-on'
gem 'json-jwt'
Copy link

Copilot AI Aug 11, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

The 'json-jwt' gem is declared twice (lines 70 and 73). The duplicate declaration should be removed.

Suggested change
gem 'json-jwt'

Copilot uses AI. Check for mistakes.
gem 'logstop'
gem 'paper_trail'
gem 'acts-as-taggable-on'
gem "rolify"
gem 'redis-client'
Copy link

Copilot AI Aug 11, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

The 'redis-client' gem is declared twice (lines 67 and 76). The duplicate declaration should be removed.

Suggested change
gem 'redis-client'

Copilot uses AI. Check for mistakes.
gem 'redis-namespace'
Copy link

Copilot AI Aug 11, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

The 'redis-namespace' gem is declared twice (lines 68 and 77). The duplicate declaration should be removed.

Suggested change
gem 'redis-namespace'

Copilot uses AI. Check for mistakes.
gem 'rolify'
gem 'sidekiq', '>= 6.5.0'
Copy link

Copilot AI Aug 11, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

The sidekiq gem is declared twice with different version constraints ('>= 8.0.4' on line 69 and '>= 6.5.0' on line 79). This creates conflicting requirements and the duplicate should be removed.

Suggested change
gem 'sidekiq', '>= 6.5.0'

Copilot uses AI. Check for mistakes.

group :development, :test do
gem 'dotenv'
gem 'pry'
end

group :development, :staging do
group :development, :staging, :test do
gem 'faker'
end

group :development do
gem 'aasm-diagram'
gem "brakeman"
gem 'brakeman'
gem 'bullet'
gem "bundler-audit"
gem 'bundler-audit'
gem 'listen'
gem 'rails-erd'
gem "rubocop-rails"
gem "rubocop-rails", ">= 2.32.0"
gem "rubocop-rspec"
gem 'web-console'
end
Expand All @@ -99,10 +103,10 @@ group :test do
gem 'axe-core-rspec'
gem 'capybara'
gem 'database_cleaner'
gem 'factory_bot_rails'
gem 'factory_bot_rails', '>= 6.5.0'
gem 'rails-controller-testing'
gem 'rspec_junit_formatter'
gem 'rspec-rails'
gem 'rspec-rails', '>= 8.0.1'
gem 'selenium-webdriver'
gem 'simplecov', require: false
end
Loading