diff options
| author | GitLab Release Tools Bot <robert+release-tools@gitlab.com> | 2019-08-26 07:41:57 +0000 |
|---|---|---|
| committer | GitLab Release Tools Bot <robert+release-tools@gitlab.com> | 2019-08-26 07:41:57 +0000 |
| commit | dba5b42770abba83608b06e7d9fd552a54c0b8c7 (patch) | |
| tree | e8d2a76b1e6355c681b8e7c557c6f8c7c82e4475 /app | |
| parent | 29e1df85082b3403fc9f830307cd41e360420e1f (diff) | |
| parent | 4e39edd18b6d2f416134c348afca628cf8497f4d (diff) | |
| download | gitlab-ce-dba5b42770abba83608b06e7d9fd552a54c0b8c7.tar.gz | |
Merge branch 'security-add-job-activity-limit-ce-12-0' into '12-0-stable'
Introduce JobActivity limit for alive jobs
See merge request gitlab/gitlabhq!3341
Diffstat (limited to 'app')
| -rw-r--r-- | app/models/ci/pipeline.rb | 1 | ||||
| -rw-r--r-- | app/services/ci/create_pipeline_service.rb | 3 |
2 files changed, 3 insertions, 1 deletions
diff --git a/app/models/ci/pipeline.rb b/app/models/ci/pipeline.rb index 3727a9861aa..ce87fd40e56 100644 --- a/app/models/ci/pipeline.rb +++ b/app/models/ci/pipeline.rb @@ -203,6 +203,7 @@ module Ci scope :for_sha, -> (sha) { where(sha: sha) } scope :for_source_sha, -> (source_sha) { where(source_sha: source_sha) } scope :for_sha_or_source_sha, -> (sha) { for_sha(sha).or(for_source_sha(sha)) } + scope :created_after, -> (time) { where('ci_pipelines.created_at > ?', time) } scope :triggered_by_merge_request, -> (merge_request) do where(source: :merge_request_event, merge_request: merge_request) diff --git a/app/services/ci/create_pipeline_service.rb b/app/services/ci/create_pipeline_service.rb index c17712355af..13861aabd89 100644 --- a/app/services/ci/create_pipeline_service.rb +++ b/app/services/ci/create_pipeline_service.rb @@ -15,7 +15,8 @@ module Ci Gitlab::Ci::Pipeline::Chain::Limit::Size, Gitlab::Ci::Pipeline::Chain::Populate, Gitlab::Ci::Pipeline::Chain::Create, - Gitlab::Ci::Pipeline::Chain::Limit::Activity].freeze + Gitlab::Ci::Pipeline::Chain::Limit::Activity, + Gitlab::Ci::Pipeline::Chain::Limit::JobActivity].freeze def execute(source, ignore_skip_ci: false, save_on_errors: true, trigger_request: nil, schedule: nil, merge_request: nil, **options, &block) @pipeline = Ci::Pipeline.new |