Merge pull request #1313 from GSA/main

Admin Production Deploy - 3/19/2024
GSA · Mar 19, 2024 · c3f479d · c3f479d
2 parents fe123af + 6b31e5f
commit c3f479d
Show file tree

Hide file tree

Showing 34 changed files with 581 additions and 226 deletions.
diff --git a/.github/workflows/deploy-demo.yml b/.github/workflows/deploy-demo.yml
@@ -54,6 +54,7 @@ jobs:
           ADMIN_CLIENT_SECRET: ${{ secrets.ADMIN_CLIENT_SECRET }}
           NEW_RELIC_LICENSE_KEY: ${{ secrets.NEW_RELIC_LICENSE_KEY }}
           NR_BROWSER_KEY: ${{ secrets.NR_BROWSER_KEY }}
+          COMMIT_HASH: ${{ github.sha }}
           LOGIN_PEM: ${{ secrets.LOGIN_PEM }}
           LOGIN_DOT_GOV_CLIENT_ID: "urn:gov:gsa:openidconnect.profiles:sp:sso:gsa:notify-gov"
           LOGIN_DOT_GOV_USER_INFO_URL: "https://secure.login.gov/api/openid_connect/userinfo"

diff --git a/.github/workflows/deploy-prod.yml b/.github/workflows/deploy-prod.yml
@@ -54,6 +54,7 @@ jobs:
           ADMIN_CLIENT_SECRET: ${{ secrets.ADMIN_CLIENT_SECRET }}
           NEW_RELIC_LICENSE_KEY: ${{ secrets.NEW_RELIC_LICENSE_KEY }}
           NR_BROWSER_KEY: ${{ secrets.NR_BROWSER_KEY }}
+          COMMIT_HASH: ${{ github.sha }}
           LOGIN_PEM: ${{ secrets.LOGIN_PEM }}
           LOGIN_DOT_GOV_CLIENT_ID: "urn:gov:gsa:openidconnect.profiles:sp:sso:gsa:notify-gov"
           LOGIN_DOT_GOV_USER_INFO_URL: "https://secure.login.gov/api/openid_connect/userinfo"

diff --git a/.github/workflows/deploy.yml b/.github/workflows/deploy.yml
@@ -60,6 +60,7 @@ jobs:
           ADMIN_CLIENT_SECRET: ${{ secrets.ADMIN_CLIENT_SECRET }}
           NEW_RELIC_LICENSE_KEY: ${{ secrets.NEW_RELIC_LICENSE_KEY }}
           NR_BROWSER_KEY: ${{ secrets.NR_BROWSER_KEY }}
+          COMMIT_HASH: ${{ github.sha }}
           LOGIN_PEM: ${{ secrets.LOGIN_PEM }}
           LOGIN_DOT_GOV_CLIENT_ID: "urn:gov:gsa:openidconnect.profiles:sp:sso:gsa:notify-gov"
           LOGIN_DOT_GOV_USER_INFO_URL: "https://secure.login.gov/api/openid_connect/userinfo"
@@ -81,6 +82,7 @@ jobs:
             --var ADMIN_CLIENT_SECRET="$ADMIN_CLIENT_SECRET"
             --var NEW_RELIC_LICENSE_KEY="$NEW_RELIC_LICENSE_KEY"
             --var NR_BROWSER_KEY="$NR_BROWSER_KEY"
+            --var COMMIT_HASH="$COMMIT_HASH"
             --var LOGIN_PEM="$LOGIN_PEM"
             --var LOGIN_DOT_GOV_CLIENT_ID="$LOGIN_DOT_GOV_CLIENT_ID"
             --var LOGIN_DOT_GOV_USER_INFO_URL="$LOGIN_DOT_GOV_USER_INFO_URL"

diff --git a/app/assets/error_pages/5xx.html b/app/assets/error_pages/5xx.html
@@ -22,7 +22,7 @@
   <link rel="stylesheet" media="screen" href="/static/stylesheets/main.css?d077f86473501ab244de0b30600536ee" />
   <link rel="stylesheet" media="print" href="/static/stylesheets/print.css?28010888ca5719dc83d7c2c80f6ed2b2" />
 
-  <meta property="og:image" content="/static/images/usa-opengraph-image.png">
+  <meta property="og:image" content="/static/images/notify-og-image.png">
 </head>
 
 <body class="usa-template__body">
@@ -107,4 +107,4 @@ <h2 class="usa-sr-only">Support links</h2>
 
 </body>
 
-</html>
+</html>
diff --git a/app/assets/images/android-chrome-192x192.png b/app/assets/images/android-chrome-192x192.png
diff --git a/app/assets/images/android-chrome-256x256.png b/app/assets/images/android-chrome-256x256.png
diff --git a/app/assets/images/apple-touch-icon.png b/app/assets/images/apple-touch-icon.png
diff --git a/app/assets/images/favicon-16x16.png b/app/assets/images/favicon-16x16.png
diff --git a/app/assets/images/favicon-32x32.png b/app/assets/images/favicon-32x32.png
diff --git a/app/assets/images/favicon.ico b/app/assets/images/favicon.ico
diff --git a/app/assets/images/mstile-150x150.png b/app/assets/images/mstile-150x150.png
diff --git a/app/assets/images/notify-bell.svg b/app/assets/images/notify-bell.svg
diff --git a/app/assets/images/notify-dark-favicon.png b/app/assets/images/notify-dark-favicon.png
diff --git a/app/assets/images/notify-logo-dark.svg b/app/assets/images/notify-logo-dark.svg
diff --git a/app/assets/images/notify-logo.png b/app/assets/images/notify-logo.png