diff options
| author | GitLab Bot <gitlab-bot@gitlab.com> | 2022-06-29 14:10:35 +0000 |
|---|---|---|
| committer | GitLab Bot <gitlab-bot@gitlab.com> | 2022-06-29 14:10:41 +0000 |
| commit | 4279c892b46b4a9de9f0580cf011173e716ebf6c (patch) | |
| tree | 39c5a2ee723725071d325ddd459921ee0571a6f2 | |
| parent | 37823295027da50ff5bc14df482b8cba09bf41b4 (diff) | |
| download | gitlab-ce-4279c892b46b4a9de9f0580cf011173e716ebf6c.tar.gz | |
Add latest changes from gitlab-org/security/gitlab@15-1-stable-ee
| -rw-r--r-- | app/models/concerns/enums/ci/commit_status.rb | 3 | ||||
| -rw-r--r-- | app/presenters/commit_status_presenter.rb | 3 | ||||
| -rw-r--r-- | lib/gitlab/ci/status/build/failed.rb | 3 |
3 files changed, 6 insertions, 3 deletions
diff --git a/app/models/concerns/enums/ci/commit_status.rb b/app/models/concerns/enums/ci/commit_status.rb index 312b88a4d6d..445277a7a7c 100644 --- a/app/models/concerns/enums/ci/commit_status.rb +++ b/app/models/concerns/enums/ci/commit_status.rb @@ -35,7 +35,8 @@ module Enums bridge_pipeline_is_child_pipeline: 1_006, # not used anymore, but cannot be deleted because of old data downstream_pipeline_creation_failed: 1_007, secrets_provider_not_found: 1_008, - reached_max_descendant_pipelines_depth: 1_009 + reached_max_descendant_pipelines_depth: 1_009, + ip_restriction_failure: 1_010 } end end diff --git a/app/presenters/commit_status_presenter.rb b/app/presenters/commit_status_presenter.rb index fdfcc896bf8..675288da35b 100644 --- a/app/presenters/commit_status_presenter.rb +++ b/app/presenters/commit_status_presenter.rb @@ -30,7 +30,8 @@ class CommitStatusPresenter < Gitlab::View::Presenter::Delegated trace_size_exceeded: 'The job log size limit was reached', builds_disabled: 'The CI/CD is disabled for this project', environment_creation_failure: 'This job could not be executed because it would create an environment with an invalid parameter.', - deployment_rejected: 'This deployment job was rejected.' + deployment_rejected: 'This deployment job was rejected.', + ip_restriction_failure: "This job could not be executed because group IP address restrictions are enabled, and the runner's IP address is not in the allowed range." }.freeze TROUBLESHOOTING_DOC = { diff --git a/lib/gitlab/ci/status/build/failed.rb b/lib/gitlab/ci/status/build/failed.rb index 5dd28157b1f..1a074c1af53 100644 --- a/lib/gitlab/ci/status/build/failed.rb +++ b/lib/gitlab/ci/status/build/failed.rb @@ -35,7 +35,8 @@ module Gitlab trace_size_exceeded: 'log size limit exceeded', builds_disabled: 'project builds are disabled', environment_creation_failure: 'environment creation failure', - deployment_rejected: 'deployment rejected' + deployment_rejected: 'deployment rejected', + ip_restriction_failure: 'IP address restriction failure' }.freeze private_constant :REASONS |