summaryrefslogtreecommitdiff
path: root/app/services
diff options
context:
space:
mode:
authorFabio Pitino <fpitino@gitlab.com>2019-08-19 16:29:53 +0200
committerFabio Pitino <fpitino@gitlab.com>2019-08-21 10:03:07 +0200
commit45c5144e36e73c80e34282dda7b7c1c32a1fc0ea (patch)
tree14f92cdfed1f68c5e317aa3bfc4be069138423ed /app/services
parent3ac4a2989d28f868f71a88b21466c301dca377b4 (diff)
downloadgitlab-ce-45c5144e36e73c80e34282dda7b7c1c32a1fc0ea.tar.gz
Add active_jobs_limit to plans table
This is a port from EE changes where we introduce a new limit for Plan model. https://dev.gitlab.org/gitlab/gitlab-ee/merge_requests/1182
Diffstat (limited to 'app/services')
-rw-r--r--app/services/ci/create_pipeline_service.rb3
1 files changed, 2 insertions, 1 deletions
diff --git a/app/services/ci/create_pipeline_service.rb b/app/services/ci/create_pipeline_service.rb
index cdcc4b15bea..29317f1176e 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