summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAdam Niedzielski <adamsunday@gmail.com>2017-03-02 17:41:41 +0100
committerAdam Niedzielski <adamsunday@gmail.com>2017-03-02 17:41:41 +0100
commit423032a1187cce0656fe6f54bd14d9372736e355 (patch)
tree24b514f53493f1847d0256025f93c72268b81dde
parente9d75a4b856513ce848c0a704cced54cff9f48f8 (diff)
downloadgitlab-ce-fix-build-mock-ci-service.tar.gz
Add missing association for mock_ci_servicefix-build-mock-ci-service
-rw-r--r--app/models/project.rb1
-rw-r--r--spec/lib/gitlab/import_export/all_models.yml1
2 files changed, 2 insertions, 0 deletions
diff --git a/app/models/project.rb b/app/models/project.rb
index 0c2494d3c32..0d8cdeb6fbc 100644
--- a/app/models/project.rb
+++ b/app/models/project.rb
@@ -113,6 +113,7 @@ class Project < ActiveRecord::Base
has_one :gitlab_issue_tracker_service, dependent: :destroy, inverse_of: :project
has_one :external_wiki_service, dependent: :destroy
has_one :kubernetes_service, dependent: :destroy, inverse_of: :project
+ has_one :mock_ci_service, dependent: :destroy
has_one :forked_project_link, dependent: :destroy, foreign_key: "forked_to_project_id"
has_one :forked_from_project, through: :forked_project_link
diff --git a/spec/lib/gitlab/import_export/all_models.yml b/spec/lib/gitlab/import_export/all_models.yml
index 06617f3b007..eef283c2460 100644
--- a/spec/lib/gitlab/import_export/all_models.yml
+++ b/spec/lib/gitlab/import_export/all_models.yml
@@ -153,6 +153,7 @@ project:
- gitlab_issue_tracker_service
- external_wiki_service
- kubernetes_service
+- mock_ci_service
- forked_project_link
- forked_from_project
- forked_project_links