Merge pull request #10795 from 18F/stages/rc-2024-06-11

Deploy RC 388 to Production

.gitattributes

@@ -0,0 +1,140 @@
+# code: language=gitattributes
+
+######################################################################
+# GITATTRIBUTES: Global
+######################################################################
+# See: https://www.git-scm.com/docs/gitattributes
+# Details per file setting:
+#   text    These files should be normalized (i.e. convert CRLF to LF).
+#   binary  These files are binary and should not be diffed,
+#           normalized, etc. Only report if the file has changed.
+#           NOTE: "binary" is a macro for -diff -merge -text.
+#
+# Relevant builtin diff patterns (see: https://www.git-scm.com/docs/gitattributes#_defining_a_custom_hunk_header)
+# | Diff       | Description                                            |
+# | ---------- | ------------------------------------------------------ |
+# | `bash`     | Bash language.                                         |
+# |            | Covers a superset of POSIX shell functions.            |
+# | `css`      | Cascading style sheets.                                |
+# | `html`     | HTML/XHTML documents.                                  |
+# | `markdown` | Markdown documents.                                    |
+# | `python`   | Python language.                                       |
+# | `ruby`     | Ruby language.                                         |
+# | `rust`     | Rust language.                                         |
+# | `tex`      | LaTeX documents.                                       |
+
+######################################################################
+
+# ====================================================================
+# MACROS #
+# ====================================================================
+# All macros assume the default rule is: `text eol=lf` and sets/removes attributes accordingly
+# If the default rule changes, these macros must be updated as well.
+
+# OVERRIDES
+## See builtin binary definition here: https://www.git-scm.com/docs/gitattributes#_defining_macro_attributes
+[attr]binary        -text -diff -merge !eol
+
+# CUSTOM
+
+### Prevent end-of-line conversion
+[attr]input         -text -eol
+
+## Diff Macros
+### Useful for declaring which diff pattern to use for files that may
+### not be captured correctly by Git's heuristics.
+[attr]bash          diff=bash
+[attr]css           diff=css
+[attr]html          diff=html
+[attr]xml           diff=html
+[attr]markdown      diff=markdown
+[attr]python        diff=python
+[attr]ruby          diff=ruby
+[attr]scheme        diff=scheme
+
+### Do not generate a diff, instead print a "Binary files differ" message
+### Useful for autogenerated text files that may produce large, noisy diffs
+[attr]autogen       -diff
+[attr]lockfile      -diff
+
+### Fix syntax highlighting on GitHub to allow comments
+[attr]jsonc         linguist-language=JSON-with-Comments
+
+######################################################################
+
+# ====================================================================
+# RULES
+# ====================================================================
+
+# --------------------------------------------------------------------
+# DEFAULT RULE
+# --------------------------------------------------------------------
+# Auto detect text files and perform LF normalization
+*                   text eol=lf
+
+# --------------------------------------------------------------------
+# PATTERN RULES
+# --------------------------------------------------------------------
+# Common settings that generally should always be used with your language specific settings
+
+# Text files where line endings should be preserved
+*.patch             -text
+
+# Assets
+## Graphics
+*.gif               binary
+*.ico               binary
+*.jpeg              binary
+*.jpg               binary
+*.png               binary
+*.tif               binary
+*.tiff              binary
+*.webp              binary
+*.svgz              binary
+
+## Fonts
+*.ttf               binary
+*.eot               binary
+*.otf               binary
+*.woff              binary
+*.woff2             binary
+
+
+# These are explicitly windows files and should use crlf
+*.bat               eol=crlf
+*.cmd               text eol=crlf
+*.ps1               text eol=crlf
+
+
+# Uncommon (to Git) sourcecode files
+*.scss              text css
+
+
+# Fix syntax highlighting on GitHub to allow comments
+tsconfig.json       jsonc
+
+# Lock files (usually for managing project dependencies)
+*.lock              lockfile
+
+# Auto-generated and minified files
+*.map               autogen
+*.min.js            autogen
+
+# --------------------------------------------------------------------
+# PROJECT-SPEFICIC RULES
+# --------------------------------------------------------------------# 
+
+## Lock files
+knapsack_rspec_report.json      lockfile
+package-lock.json               lockfile
+pnpm-lock.yaml                  lockfile
+
+### Force text diff for Gemfile.lock
+Gemfile.lock                    diff
+
+## Executables and runtimes
+*.wasm                          binary
+
+## Data files
+*_model-shard?                  binary
+

.gitlab-ci.yml

@@ -8,7 +8,7 @@ variables:
   FF_SCRIPT_SECTIONS: 'true'
   JUNIT_OUTPUT: 'true'
   ECR_REGISTRY: '${AWS_ACCOUNT_ID}.dkr.ecr.${AWS_REGION}.amazonaws.com'
-  IDP_CI_SHA: 'sha256:756a1d450b422720dee36cb9a6217687bcad1e40b780219d360989861ce94212'
+  IDP_CI_SHA: 'sha256:0cea6ebf8fa4d693177f46ae9a8c24e6030245f3c795753269b7910178d5cfdd'
   PKI_IMAGE_TAG: 'main'
   DASHBOARD_IMAGE_TAG: 'main'
 

.rubocop.yml

@@ -619,6 +619,10 @@ Lint/UnusedMethodArgument:
   Enabled: true
   AllowUnusedKeywordArguments: false
 
+Lint/UnusedBlockArgument:
+  Enabled: true
+  AllowUnusedKeywordArguments: true
+
 Lint/UriEscapeUnescape:
   Enabled: true
 

.ruby-version

@@ -1 +1 @@
-3.3.0
+3.3.1

Gemfile

@@ -33,7 +33,7 @@ gem 'foundation_emails'
 gem 'good_job', '~> 3.0'
 gem 'http_accept_language'
 gem 'identity-hostdata', github: '18F/identity-hostdata', tag: 'v4.0.0'
-gem 'identity-logging', github: '18F/identity-logging', tag: 'v0.1.0'
+gem 'identity-logging', github: '18F/identity-logging', tag: 'v0.1.1'
 gem 'identity_validations', github: '18F/identity-validations', tag: 'v0.7.2'
 gem 'jsbundling-rails', '~> 1.1.2'
 gem 'jwe'
@@ -68,7 +68,7 @@ gem 'rqrcode'
 gem 'ruby-progressbar'
 gem 'ruby-saml'
 gem 'safe_target_blank', '>= 1.0.2'
-gem 'saml_idp', github: '18F/saml_idp', tag: '0.21.0-18f'
+gem 'saml_idp', github: '18F/saml_idp', tag: '0.21.2-18f'
 gem 'scrypt'
 gem 'simple_form', '>= 5.0.2'
 gem 'stringex', require: false

Gemfile.lock

@@ -10,10 +10,10 @@ GIT
 
 GIT
   remote: https://github.com/18F/identity-logging.git
-  revision: 7a341c9784275f44b0b0c3456a00a51fa79f4241
-  tag: v0.1.0
+  revision: dff8e73ab1c3bfabcf5c9257521e07dad1744373
+  tag: v0.1.1
   specs:
-    identity-logging (0.1.0)
+    identity-logging (0.1.1)
       lograge (>= 0.11.2)
       rails (>= 6.1)
 
@@ -35,10 +35,10 @@ GIT
 
 GIT
   remote: https://github.com/18F/saml_idp.git
-  revision: 33275d69f7609e448942d6e3ce5c27779920995f
-  tag: 0.21.0-18f
+  revision: 5ad9e188efdfa6597697dd87f9cb9e8efa8d7d09
+  tag: 0.21.2-18f
   specs:
-    saml_idp (0.21.0.pre.18f)
+    saml_idp (0.21.2.pre.18f)
       activesupport
       builder
       faraday
@@ -315,10 +315,10 @@ GEM
     erubi (1.12.0)
     et-orbi (1.2.7)
       tzinfo
-    factory_bot (6.2.1)
+    factory_bot (6.4.6)
       activesupport (>= 5.0.0)
-    factory_bot_rails (6.2.0)
-      factory_bot (~> 6.2.0)
+    factory_bot_rails (6.4.3)
+      factory_bot (~> 6.4)
       railties (>= 5.0.0)
     faker (2.19.0)
       i18n (>= 1.6, < 2)
@@ -865,7 +865,7 @@ DEPENDENCIES
   zxcvbn (= 0.1.9)
 
 RUBY VERSION
-   ruby 3.3.0p0
+   ruby 3.3.1p55
 
 BUNDLED WITH
    2.5.6

app/assets/fonts/glyphs.txt

@@ -1 +1 @@
- !"#$%&'(),-./0123456789:;>?@ABCDEFGHIJKLMNOPQRSTUVWXYZ_abcdefghijklmnopqrstuvwxyz~ «»¿ÀÁÈÉÊÎÓÚàáâãçèéêëíîïñóôùúû ‑—‘’“”…‹中体文简
+ !"#$%&'()+,-./0123456789:;>?@ABCDEFGHIJKLMNOPQRSTUVWXYZ_abcdefghijklmnopqrstuvwxyz~ «»¿ÀÁÈÉÊÎÓÚàáâãçèéêëíîïñóôùúû ‑—‘’“”…‹中体文简