Merge branch 'develop' into remove-legacy-form

GSA · Dec 5, 2024 · a2aacfa · a2aacfa
2 parents d8e8db5 + fc0ea38
commit a2aacfa
Show file tree

Hide file tree

Showing 255 changed files with 1,492 additions and 13,963 deletions.
diff --git a/Gemfile.lock b/Gemfile.lock
diff --git a/SECURITY.md b/SECURITY.md
@@ -0,0 +1,16 @@
+# Security Policy
+
+## Supported Versions
+
+Only certain branches are supported with security updates.
+
+| Version (branch) | Supported   |
+| ---------------- | ----------- |
+| main      | :white_check_mark: |
+| other     | :x:                |
+
+When using this code or reporting vulnerability please be sure to use supported branches and the most recent release.
+
+## Reporting a Vulnerability
+
+To report a security vulnerability, see https://www.gsa.gov/vulnerability-disclosure-policy for guidance.
diff --git a/app/assets/javascripts/performance-charts.js b/app/assets/javascripts/performance-charts.js
diff --git a/app/assets/javascripts/uswds.min.js b/app/assets/javascripts/uswds.min.js
diff --git a/app/assets/javascripts/uswds.min.js.map b/app/assets/javascripts/uswds.min.js.map
diff --git a/app/assets/stylesheets/site.scss b/app/assets/stylesheets/site.scss
@@ -553,9 +553,7 @@ table .no-wrap {
 .delete-float-right a {
   color: red;
 }
-.delete-goal-objective, .delete-goal-target {
-  color: #999999;
-}
+
 .tags-select {
   height: 250px;
 }

diff --git a/app/assets/stylesheets/uswds-styles.css b/app/assets/stylesheets/uswds-styles.css
diff --git a/app/assets/stylesheets/uswds-styles.css.map b/app/assets/stylesheets/uswds-styles.css.map
diff --git a/app/controllers/admin/collections_controller.rb b/app/controllers/admin/collections_controller.rb