diff options
| author | Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> | 2015-03-17 22:59:45 -0700 |
|---|---|---|
| committer | Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> | 2015-03-17 22:59:45 -0700 |
| commit | 63d0bf1f5e45f46ed346425585f258fc22acee8a (patch) | |
| tree | 2b1692291dd80b2a974088a36714396ea1ae7a79 /app | |
| parent | 8aa2cd465c0aee74fcc14a3282a4885908aec88b (diff) | |
| download | gitlab-ce-63d0bf1f5e45f46ed346425585f258fc22acee8a.tar.gz | |
Fix external wiki service
Diffstat (limited to 'app')
| -rw-r--r-- | app/models/project.rb | 2 | ||||
| -rw-r--r-- | app/models/service.rb | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/app/models/project.rb b/app/models/project.rb index 2d198de6611..c50b8a12621 100644 --- a/app/models/project.rb +++ b/app/models/project.rb @@ -89,11 +89,11 @@ class Project < ActiveRecord::Base has_one :redmine_service, dependent: :destroy has_one :custom_issue_tracker_service, dependent: :destroy has_one :gitlab_issue_tracker_service, dependent: :destroy + has_one :external_wiki_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 - has_one :external_wiki_service, dependent: :destroy # Merge Requests for target project should be removed with it has_many :merge_requests, dependent: :destroy, foreign_key: 'target_project_id' # Merge requests from source project should be kept when source project was removed diff --git a/app/models/service.rb b/app/models/service.rb index 918af88b393..f54ad19666b 100644 --- a/app/models/service.rb +++ b/app/models/service.rb @@ -140,7 +140,7 @@ class Service < ActiveRecord::Base redmine custom_issue_tracker irker - external_wiki_service + external_wiki ) end |