Solve merge conflict and add a change note

maikypedia · maikypedia · commit a229f7a832d2 · 2023-03-16T16:15:02.000+01:00
diff --git a/ruby/ql/lib/codeql/ruby/Frameworks.qll b/ruby/ql/lib/codeql/ruby/Frameworks.qll
@@ -27,5 +27,6 @@ private import codeql.ruby.frameworks.ActionDispatch
 private import codeql.ruby.frameworks.PosixSpawn
 private import codeql.ruby.frameworks.StringFormatters
 private import codeql.ruby.frameworks.Json
+private import codeql.ruby.frameworks.Twirp
 private import codeql.ruby.frameworks.Erb
 private import codeql.ruby.frameworks.Slim
diff --git a/ruby/ql/src/change-notes/2023-03-15-ssti-query b/ruby/ql/src/change-notes/2023-03-15-ssti-query
@@ -0,0 +1,4 @@
+---
+category: newQuery
+---
+* Added a new experimental query, `rb/server-side-template-injection`, to detect cases where user input may be embedded into a template's code in an unsafe manner.

-Original file line number
+Diff line change
@@ @@ -0,0 +1,4 @@ @@
 +---
 +category: newQuery
 +---
 +* Added a new experimental query, `rb/server-side-template-injection`, to detect cases where user input may be embedded into a template's code in an unsafe manner.