diff options
Diffstat (limited to 'app/presenters/ci')
| -rw-r--r-- | app/presenters/ci/build_runner_presenter.rb | 18 | ||||
| -rw-r--r-- | app/presenters/ci/pipeline_presenter.rb | 4 |
2 files changed, 20 insertions, 2 deletions
diff --git a/app/presenters/ci/build_runner_presenter.rb b/app/presenters/ci/build_runner_presenter.rb index 769b793ee75..6978bc46475 100644 --- a/app/presenters/ci/build_runner_presenter.rb +++ b/app/presenters/ci/build_runner_presenter.rb @@ -33,7 +33,11 @@ module Ci end def runner_variables - variables.to_runner_variables + if Feature.enabled?(:variable_inside_variable, project) + variables.sort_and_expand_all(project, keep_undefined: true).to_runner_variables + else + variables.to_runner_variables + end end def refspecs @@ -51,6 +55,18 @@ module Ci specs end + # rubocop: disable CodeReuse/ActiveRecord + def all_dependencies + dependencies = super + + if Feature.enabled?(:preload_associations_jobs_request_api_endpoint, project, default_enabled: :yaml) + ActiveRecord::Associations::Preloader.new.preload(dependencies, :job_artifacts_archive) + end + + dependencies + end + # rubocop: enable CodeReuse/ActiveRecord + private def create_archive(artifacts) diff --git a/app/presenters/ci/pipeline_presenter.rb b/app/presenters/ci/pipeline_presenter.rb index 4e955469ddf..a2cdabb912f 100644 --- a/app/presenters/ci/pipeline_presenter.rb +++ b/app/presenters/ci/pipeline_presenter.rb @@ -14,7 +14,9 @@ module Ci 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!', + project_deleted: 'The associated project was deleted', + user_blocked: 'The user who created this pipeline is blocked' } end presents :pipeline |