diff options
| author | Kamil Trzciński <ayufan@ayufan.eu> | 2018-06-01 15:43:43 +0300 |
|---|---|---|
| committer | Kamil Trzciński <ayufan@ayufan.eu> | 2018-06-01 15:43:43 +0300 |
| commit | afb2d667cae42b77e090b4b240848c4d4ddcaf2d (patch) | |
| tree | 6cb66332f5ec2889bbc4e3dbd870a6b65fbe8aa1 /app/models/clusters | |
| parent | 709e8b263863c5a92959700b67462c2ebe4f1831 (diff) | |
| parent | 5c6c184f70719c464690455abc02e777b3ba4b7b (diff) | |
Merge branch '46010-add-more-validations-for-runners-and-runner-type' into 'master'
Improve validations for Ci::Runner#runner_type
See merge request gitlab-org/gitlab-ce!18901
Diffstat (limited to 'app/models/clusters')
| -rw-r--r-- | app/models/clusters/applications/runner.rb | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/app/models/clusters/applications/runner.rb b/app/models/clusters/applications/runner.rb index b881b4eaf36..e6f795f3e0b 100644 --- a/app/models/clusters/applications/runner.rb +++ b/app/models/clusters/applications/runner.rb @@ -43,7 +43,7 @@ module Clusters def create_and_assign_runner transaction do - project.runners.create!(runner_create_params).tap do |runner| + Ci::Runner.create!(runner_create_params).tap do |runner| update!(runner_id: runner.id) end end @@ -53,7 +53,8 @@ module Clusters { name: 'kubernetes-cluster', runner_type: :project_type, - tag_list: %w(kubernetes cluster) + tag_list: %w(kubernetes cluster), + projects: [project] } end |