Merge commit '8e0fd2d619dac93c193da6a762564244e5622498' into glitch-soc/merge-upstream

Conflicts: - `.github/workflows/build-image.yml`: Upstream changed how releases are tagged, we don't have releases. Ignored the changes
2023-07-12 15:54:58 +02:00
parent 15f6fa8d47 8e0fd2d619
commit 2aadebc769
10 changed files with 292 additions and 157 deletions
--- a/2
+++ b/2
@@ -158,7 +158,7 @@ group :development do
  gem 'letter_opener_web', '~> 2.0'

  # Security analysis CLI tools
-  gem 'brakeman', '~> 5.4', require: false
+  gem 'brakeman', '~> 6.0', require: false
  gem 'bundler-audit', '~> 0.9', require: false

  # Linter CLI for HAML files