diff options
| author | Matija Čupić <matteeyah@gmail.com> | 2017-12-04 16:51:06 +0100 |
|---|---|---|
| committer | Matija Čupić <matteeyah@gmail.com> | 2017-12-04 16:51:06 +0100 |
| commit | a42b43ce7a9146ac1035328f2bc1cfc5f06e9371 (patch) | |
| tree | b5bd97647bcce144f6fad7dc4d61aa8211ad23e9 | |
| parent | b6d899667c395bf67c8def537e96b1a81e71a7eb (diff) | |
| download | gitlab-ce-a42b43ce7a9146ac1035328f2bc1cfc5f06e9371.tar.gz | |
Remove cluster from Project model
| -rw-r--r-- | app/models/project.rb | 1 | ||||
| -rw-r--r-- | spec/models/project_spec.rb | 2 |
2 files changed, 1 insertions, 2 deletions
diff --git a/app/models/project.rb b/app/models/project.rb index eaf4f555d3b..0cb07e14cd8 100644 --- a/app/models/project.rb +++ b/app/models/project.rb @@ -189,7 +189,6 @@ class Project < ActiveRecord::Base has_one :statistics, class_name: 'ProjectStatistics' has_one :cluster_project, class_name: 'Clusters::Project' - has_one :cluster, through: :cluster_project, class_name: 'Clusters::Cluster' has_many :clusters, through: :cluster_project, class_name: 'Clusters::Cluster' # Container repositories need to remove data from the container registry, diff --git a/spec/models/project_spec.rb b/spec/models/project_spec.rb index 521b7bd70ba..57f0034c1d4 100644 --- a/spec/models/project_spec.rb +++ b/spec/models/project_spec.rb @@ -78,7 +78,7 @@ describe Project do it { is_expected.to have_many(:uploads).dependent(:destroy) } it { is_expected.to have_many(:pipeline_schedules) } it { is_expected.to have_many(:members_and_requesters) } - it { is_expected.to have_one(:cluster) } + it { is_expected.to have_many(:clusters) } it { is_expected.to have_many(:custom_attributes).class_name('ProjectCustomAttribute') } context 'after initialized' do |