Welcome to mirror list, hosted at ThFree Co, Russian Federation.

gitlab.com/gitlab-org/gitlab-foss.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGitLab Bot <gitlab-bot@gitlab.com>2022-06-29 17:10:35 +0300
committerGitLab Bot <gitlab-bot@gitlab.com>2022-06-29 17:10:41 +0300
commit4279c892b46b4a9de9f0580cf011173e716ebf6c (patch)
tree39c5a2ee723725071d325ddd459921ee0571a6f2 /app/presenters
parent37823295027da50ff5bc14df482b8cba09bf41b4 (diff)
Add latest changes from gitlab-org/security/gitlab@15-1-stable-ee
Diffstat (limited to 'app/presenters')
-rw-r--r--app/presenters/commit_status_presenter.rb3
1 files changed, 2 insertions, 1 deletions
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 = {