Add latest changes from gitlab-org/gitlab@14-4-stable-eev14.4.0-rc42

2 files changed, 23 insertions, 2 deletions

diff --git a/lib/gitlab/view/presenter/base.rb b/lib/gitlab/view/presenter/base.rb
index 9dc687f7740..3bacad72050 100644
--- a/lib/gitlab/view/presenter/base.rb
+++ b/lib/gitlab/view/presenter/base.rb
@@ -47,8 +47,18 @@ module Gitlab
             true
           end
 
-          def presents(name)
-            define_method(name) { subject }
+          def presents(*target_classes, as: nil)
+            if target_classes.any? { |k| k.is_a?(Symbol) }
+              raise ArgumentError, "Unsupported target class type: #{target_classes}."
+            end
+
+            if self < ::Gitlab::View::Presenter::Delegated
+              target_classes.each { |k| delegator_target(k) }
+            elsif self < ::Gitlab::View::Presenter::Simple
+              # no-op
+            end
+
+            define_method(as) { subject } if as
           end
         end
       end
diff --git a/lib/gitlab/view/presenter/delegated.rb b/lib/gitlab/view/presenter/delegated.rb
index d14f8cc4e5e..259cf0cf457 100644
--- a/lib/gitlab/view/presenter/delegated.rb
+++ b/lib/gitlab/view/presenter/delegated.rb
@@ -4,7 +4,18 @@ module Gitlab
   module View
     module Presenter
       class Delegated < SimpleDelegator
+        extend ::Gitlab::Utils::DelegatorOverride
+
+        # TODO: Stop including auxiliary methods/modules in `Presenter::Base` as
+        # it overrides many methods in the Active Record models.
+        # See https://gitlab.com/gitlab-org/gitlab/-/blob/master/app/presenters/README.md#validate-accidental-overrides
+        # for more information.
         include Gitlab::View::Presenter::Base
+        delegator_override_with Gitlab::Routing.url_helpers
+        delegator_override :can?
+        delegator_override :declarative_policy_delegate
+        delegator_override :present
+        delegator_override :web_url
 
         def initialize(subject, **attributes)
           @subject = subject