diff options
| author | Grzegorz Bizon <grzegorz@gitlab.com> | 2018-06-05 10:39:59 +0300 |
|---|---|---|
| committer | Grzegorz Bizon <grzegorz@gitlab.com> | 2018-06-05 10:39:59 +0300 |
| commit | 809a50fcbf5ecfbf5ec02671f1ca2710a96f58d3 (patch) | |
| tree | 0b77ad7a705f6477b03d0f83634a73e3cf36f7d1 /app/models/ci/runner_namespace.rb | |
| parent | 114c26ccf0f10788271c6108774e72809a7f93e1 (diff) | |
| parent | 04236363bce399fbde36f396fdcf51d61735e1b0 (diff) | |
Merge branch 'master' into 'backstage/gb/use-persisted-stages-to-improve-pipelines-table'
Conflicts:
app/models/ci/pipeline.rb
Diffstat (limited to 'app/models/ci/runner_namespace.rb')
| -rw-r--r-- | app/models/ci/runner_namespace.rb | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/app/models/ci/runner_namespace.rb b/app/models/ci/runner_namespace.rb index 3269f86e8ca..29508fdd326 100644 --- a/app/models/ci/runner_namespace.rb +++ b/app/models/ci/runner_namespace.rb @@ -2,8 +2,10 @@ module Ci class RunnerNamespace < ActiveRecord::Base extend Gitlab::Ci::Model - belongs_to :runner - belongs_to :namespace, class_name: '::Namespace' + belongs_to :runner, inverse_of: :runner_namespaces, validate: true + belongs_to :namespace, inverse_of: :runner_namespaces, class_name: '::Namespace' belongs_to :group, class_name: '::Group', foreign_key: :namespace_id + + validates :runner_id, uniqueness: { scope: :namespace_id } end end |