diff options
| author | Douwe Maan <douwe@gitlab.com> | 2017-03-02 18:04:37 +0000 |
|---|---|---|
| committer | Douwe Maan <douwe@gitlab.com> | 2017-03-02 18:04:37 +0000 |
| commit | c652be6cf1dd581a1019549dc06df7f9386fd0e0 (patch) | |
| tree | 890ffa7772cf76face9e306e40325c83eaf65fd6 | |
| parent | 44bba436ffa92c56a7117b0fd103120f3796593f (diff) | |
| parent | 423032a1187cce0656fe6f54bd14d9372736e355 (diff) | |
| download | gitlab-ce-c652be6cf1dd581a1019549dc06df7f9386fd0e0.tar.gz | |
Merge branch 'fix-build-mock-ci-service' into 'master'
Add missing association for mock_ci_service
See merge request !9668
| -rw-r--r-- | app/models/project.rb | 1 | ||||
| -rw-r--r-- | spec/lib/gitlab/import_export/all_models.yml | 1 |
2 files changed, 2 insertions, 0 deletions
diff --git a/app/models/project.rb b/app/models/project.rb index fa031b061d8..1ac4a178a9b 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 |