codeqlhelper
diff --git a/‎ruby/ql/lib/codeql/ruby/frameworks/ActionController.qll
Lines changed: 2 additions & 1 deletion b/‎ruby/ql/lib/codeql/ruby/frameworks/ActionController.qll
Lines changed: 2 additions & 1 deletion
diff --git a/‎ruby/ql/test/library-tests/frameworks/action_controller/ActionController.expected
Lines changed: 110 additions & 92 deletions b/‎ruby/ql/test/library-tests/frameworks/action_controller/ActionController.expected
Lines changed: 110 additions & 92 deletions
diff --git a/‎ruby/ql/test/library-tests/frameworks/action_controller/Filters.expected
Lines changed: 144 additions & 144 deletions b/‎ruby/ql/test/library-tests/frameworks/action_controller/Filters.expected
Lines changed: 144 additions & 144 deletions
diff --git a/‎ruby/ql/test/library-tests/frameworks/action_controller/controllers/application_controller.rb renamed to ‎ruby/ql/test/library-tests/frameworks/action_controller/app/controllers/application_controller.rb b/‎ruby/ql/test/library-tests/frameworks/action_controller/controllers/application_controller.rb renamed to ‎ruby/ql/test/library-tests/frameworks/action_controller/app/controllers/application_controller.rb
diff --git a/‎ruby/ql/test/library-tests/frameworks/action_controller/controllers/comments_controller.rb renamed to ‎ruby/ql/test/library-tests/frameworks/action_controller/app/controllers/comments_controller.rb b/‎ruby/ql/test/library-tests/frameworks/action_controller/controllers/comments_controller.rb renamed to ‎ruby/ql/test/library-tests/frameworks/action_controller/app/controllers/comments_controller.rb
diff --git a/‎ruby/ql/test/library-tests/frameworks/action_controller/controllers/foo/bars_controller.rb renamed to ‎ruby/ql/test/library-tests/frameworks/action_controller/app/controllers/foo/bars_controller.rb b/‎ruby/ql/test/library-tests/frameworks/action_controller/controllers/foo/bars_controller.rb renamed to ‎ruby/ql/test/library-tests/frameworks/action_controller/app/controllers/foo/bars_controller.rb
diff --git a/‎ruby/ql/test/library-tests/frameworks/action_controller/controllers/photos_controller.rb renamed to ‎ruby/ql/test/library-tests/frameworks/action_controller/app/controllers/photos_controller.rb b/‎ruby/ql/test/library-tests/frameworks/action_controller/controllers/photos_controller.rb renamed to ‎ruby/ql/test/library-tests/frameworks/action_controller/app/controllers/photos_controller.rb
diff --git a/‎ruby/ql/test/library-tests/frameworks/action_controller/controllers/posts_controller.rb renamed to ‎ruby/ql/test/library-tests/frameworks/action_controller/app/controllers/posts_controller.rb b/‎ruby/ql/test/library-tests/frameworks/action_controller/controllers/posts_controller.rb renamed to ‎ruby/ql/test/library-tests/frameworks/action_controller/app/controllers/posts_controller.rb
diff --git a/‎ruby/ql/test/library-tests/frameworks/action_controller/controllers/tags_controller.rb renamed to ‎ruby/ql/test/library-tests/frameworks/action_controller/app/controllers/tags_controller.rb b/‎ruby/ql/test/library-tests/frameworks/action_controller/controllers/tags_controller.rb renamed to ‎ruby/ql/test/library-tests/frameworks/action_controller/app/controllers/tags_controller.rb
diff --git a/‎ruby/ql/test/library-tests/frameworks/action_controller/controllers/users/notifications_controller.rb renamed to ‎ruby/ql/test/library-tests/frameworks/action_controller/app/controllers/users/notifications_controller.rb b/‎ruby/ql/test/library-tests/frameworks/action_controller/controllers/users/notifications_controller.rb renamed to ‎ruby/ql/test/library-tests/frameworks/action_controller/app/controllers/users/notifications_controller.rb
@@ -374,7 +374,8 @@ predicate controllerTemplateFile(ActionControllerClass cls, ErbFile templateFile
     controllerPath = getActionControllerClassRelativePath(cls) and
     // `sourcePrefix` is either a prefix path ending in a slash, or empty if
     // the rails app is at the source root
-    sourcePrefix = [controllerPath.regexpCapture("^(.*/)app/controllers/(?:.*?)/(?:[^/]*)$", 1), ""] and
+    sourcePrefix =
+      [controllerPath.regexpCapture("^(.*/)app/controllers/(?:[^/]+/)?(?:[^/]*)$", 1), ""] and
     controllerPath = sourcePrefix + "app/controllers/" + subPath + "_controller.rb"
   |
     sourcePrefix + "app/views/" + subPath = templateFile.getParentContainer().getRelativePath()