Add latest changes from gitlab-org/gitlab@master

1 files changed, 4 insertions, 34 deletions

diff --git a/lib/gitlab/ci/status/build/waiting_for_approval.rb b/lib/gitlab/ci/status/build/waiting_for_approval.rb
index ac3f5838d26..c5fb32034ce 100644
--- a/lib/gitlab/ci/status/build/waiting_for_approval.rb
+++ b/lib/gitlab/ci/status/build/waiting_for_approval.rb
@@ -5,44 +5,14 @@ module Gitlab
     module Status
       module Build
         class WaitingForApproval < Status::Extended
-          def illustration
-            {
-              image: 'illustrations/manual_action.svg',
-              size: 'svg-394',
-              title: _('Waiting for approval'),
-              content: _("This job deploys to the protected environment \"%{environment}\" which requires approvals.") % { environment: subject.deployment&.environment&.name }
-            }
-          end
-
-          def has_action?
-            true
-          end
-
-          def action_icon
-            nil
-          end
-
-          def action_title
-            nil
-          end
-
-          def action_button_title
-            _('Go to environments page to approve or reject')
-          end
-
-          def action_path
-            project_environments_path(subject.project)
-          end
-
-          def action_method
-            :get
-          end
-
+          ## Extended in EE
           def self.matches?(build, user)
-            build.waiting_for_deployment_approval?
+            false
           end
         end
       end
     end
   end
 end
+
+Gitlab::Ci::Status::Build::WaitingForApproval.prepend_mod_with('Gitlab::Ci::Status::Build::WaitingForApproval')