Merge branch 'main' into TIMO/pinwheel-presence-fix

.trivyignore

@@ -1,4 +1,7 @@
-# List of vulnerabilities to ignore for the trivy scan
+# List of vulnerabilities to ignore for the trivy scan.
+# See also the `trivy-secret.yaml` file, which ignores specific files relating
+# to inadvertent secret disclosure.
+#
 # Please add safelists in the following format to make it easier when checking
 # Package/module name: URL to vulnerability for checking updates
 #  Versions:     URL to the version history

app/.gitignore

@@ -58,5 +58,7 @@ terraform.tfstate.backup
 .vscode
 /config/credentials/development.key
 /app/config/credentials/master.key
-
 /config/credentials/production.key
+
+#Profiler
+/profiler

app/Gemfile

@@ -5,7 +5,7 @@ git_source(:github) { |repo| "https://github.com/#{repo}.git" }
 ruby "3.3.5"
 
 # Bundle edge Rails instead: gem "rails", github: "rails/rails", branch: "main"
-gem "rails", "~> 7.1.3", ">= 7.1.3.4"
+gem "rails", "~> 7.1.5", ">= 7.1.5.1"
 
 # The original asset pipeline for Rails [https://github.com/rails/sprockets-rails]
 gem "sprockets-rails"
@@ -60,6 +60,12 @@ gem "faraday", "~> 2.9.0"
 gem "wicked_pdf"
 gem "actioncable-enhanced-postgresql-adapter"
 gem "aws-sdk-rails"
+gem "aws-sdk-s3"
+gem "aws-actionmailer-ses"
+
+# profiling
+gem "rack-mini-profiler"
+gem "stackprof"
 
 # https://www.ruby-lang.org/en/news/2024/08/01/dos-rexml-cve-2024-41123/
 gem "rexml", "~> 3.3.9"
@@ -108,8 +114,8 @@ group :production do
   # Add plugin for pg gem to support AWS RDS IAM
   gem "pg-aws_rds_iam", "~> 0.5.0"
 end
-
 gem "devise", "~> 4.9"
+
 gem "omniauth-rails_csrf_protection", "~> 1.0"
 gem "omniauth-azure-activedirectory-v2"
 gem "view_component"