Merge branch 'master' into rails-7-test

department-of-veterans-affairs · Dec 26, 2024 · 72e1340 · 72e1340
2 parents bc8e159 + 4430b5d
commit 72e1340
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 75 deletions.
diff --git a/.github/workflows/run-tests.yml b/.github/workflows/run-tests.yml
@@ -10,15 +10,11 @@ on:
     branches:
       [
         "master",
-        "DM-5074-ipm-homepage-updates",
-        "ci-migration",
-        "ci-migration-cv",
-        "ci-migration-en",
-        "ci-migration-pd",
-        "ci-migration-bj",
+        "rails-7",
+        "ci-migration"
       ]
   pull_request:
-    branches: ["master", "DM-5074-ipm-homepage-updates"]
+    branches: ["master", "rails-7"]
 jobs:
   build:
     name: rspec

diff --git a/app/views/shared/_header.html.erb b/app/views/shared/_header.html.erb
@@ -80,7 +80,7 @@
           </button>
 
           <ul id="communities-dropdown" class="display-none usa-nav__submenu">
-            <% communities = { "VA Immersive": "va-immersive", "Suicide Prevention": "suicide-prevention", "Age-Friendly": "age-friendly", "VHA IE Fellowships": "fellowships" }%>
+            <% communities = { "VA Immersive": "va-immersive", "Suicide Prevention": "suicide-prevention", "Age-Friendly": "age-friendly", "VHA IE Fellowships": "fellowships", "QUERI": "queri" }%>
             <% communities.each do |name, slug| %>
                 <li class="usa-nav__submenu-item border-base-light">
                   <a class="font-sans-sm desktop:font-sans-2xs margin-y-2px desktop:margin-y-0" href="/communities/<%= slug %>">

diff --git a/config/initializers/new_framework_defaults_6_1.rb b/config/initializers/new_framework_defaults_6_1.rb