Commit 057b01c1 authored by Heinrich Lee Yu's avatar Heinrich Lee Yu

Merge branch 'move_failure_reason_ce' into 'master'

Move failure_reasons message presenter in CE [RUN AS-IF-FOSS]

See merge request gitlab-org/gitlab!54043
parents 369bf8b1 39fbdc0c
...@@ -11,6 +11,9 @@ module Ci ...@@ -11,6 +11,9 @@ module Ci
{ unknown_failure: 'Unknown pipeline failure!', { unknown_failure: 'Unknown pipeline failure!',
config_error: 'CI/CD YAML configuration error!', config_error: 'CI/CD YAML configuration error!',
external_validation_failure: 'External pipeline validation failed!', external_validation_failure: 'External pipeline validation failed!',
activity_limit_exceeded: 'Pipeline activity limit exceeded!',
size_limit_exceeded: 'Pipeline size limit exceeded!',
job_activity_limit_exceeded: 'Pipeline job activity limit exceeded!',
deployments_limit_exceeded: 'Pipeline deployments limit exceeded!' } deployments_limit_exceeded: 'Pipeline deployments limit exceeded!' }
end end
......
...@@ -5,19 +5,6 @@ module EE ...@@ -5,19 +5,6 @@ module EE
module PipelinePresenter module PipelinePresenter
extend ActiveSupport::Concern extend ActiveSupport::Concern
class_methods do
extend ::Gitlab::Utils::Override
override :failure_reasons
def failure_reasons
super.merge(
activity_limit_exceeded: 'Pipeline activity limit exceeded!',
size_limit_exceeded: 'Pipeline size limit exceeded!',
job_activity_limit_exceeded: 'Pipeline job activity limit exceeded!'
)
end
end
def expose_security_dashboard? def expose_security_dashboard?
return false unless can?(current_user, :read_vulnerability, pipeline.project) return false unless can?(current_user, :read_vulnerability, pipeline.project)
......
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