Commit 56d571f9 authored by Markus Koller's avatar Markus Koller

Merge branch 'issue_341238' into 'master'

Remove ActionView::Helpers::UrlHelper inclusion as it overrides Ci::Pipeline#tag

See merge request gitlab-org/gitlab!75854
parents ef4be671 35ae9595
...@@ -5,7 +5,6 @@ module Ci ...@@ -5,7 +5,6 @@ module Ci
include Gitlab::Utils::StrongMemoize include Gitlab::Utils::StrongMemoize
delegator_override_with Gitlab::Utils::StrongMemoize # This module inclusion is expected. See https://gitlab.com/gitlab-org/gitlab/-/issues/352884. delegator_override_with Gitlab::Utils::StrongMemoize # This module inclusion is expected. See https://gitlab.com/gitlab-org/gitlab/-/issues/352884.
delegator_override_with ActionView::Helpers::TagHelper # TODO: Remove `ActionView::Helpers::UrlHelper` inclusion as it overrides `Ci::Pipeline#tag`
# We use a class method here instead of a constant, allowing EE to redefine # We use a class method here instead of a constant, allowing EE to redefine
# the returned `Hash` more easily. # the returned `Hash` more easily.
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment