Add latest changes from gitlab-org/gitlab@master

1 files changed, 34 insertions, 0 deletions

diff --git a/lib/gitlab/patch/action_dispatch_journey_formatter.rb b/lib/gitlab/patch/action_dispatch_journey_formatter.rb
new file mode 100644
index 00000000000..2d3b7bb9923
--- /dev/null
+++ b/lib/gitlab/patch/action_dispatch_journey_formatter.rb
@@ -0,0 +1,34 @@
+# frozen_string_literal: true
+
+module Gitlab
+  module Patch
+    module ActionDispatchJourneyFormatter
+      def self.prepended(mod)
+        mod.alias_method(:old_missing_keys, :missing_keys)
+        mod.remove_method(:missing_keys)
+      end
+
+      private
+
+      def missing_keys(route, parts)
+        missing_keys = nil
+        tests = route.path.requirements_for_missing_keys_check
+        route.required_parts.each do |key|
+          case tests[key]
+          when nil
+            unless parts[key]
+              missing_keys ||= []
+              missing_keys << key
+            end
+          else
+            unless tests[key].match?(parts[key])
+              missing_keys ||= []
+              missing_keys << key
+            end
+          end
+        end
+        missing_keys
+      end
+    end
+  end
+end