diff options
| author | GitLab Bot <gitlab-bot@gitlab.com> | 2020-01-28 15:08:36 +0000 |
|---|---|---|
| committer | GitLab Bot <gitlab-bot@gitlab.com> | 2020-01-28 15:08:36 +0000 |
| commit | fedf978f9aa1909ed7bb3fad767ad120a1c6bd7b (patch) | |
| tree | 1bd0f0b301ad96feda1910abe34eb89c46cc55cd /app/models/application_setting.rb | |
| parent | db24ab2b72dbff24c201410a0561e929ae7e8061 (diff) | |
| download | gitlab-ce-fedf978f9aa1909ed7bb3fad767ad120a1c6bd7b.tar.gz | |
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'app/models/application_setting.rb')
| -rw-r--r-- | app/models/application_setting.rb | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/app/models/application_setting.rb b/app/models/application_setting.rb index 0bea5d7b399..ddd43311d9b 100644 --- a/app/models/application_setting.rb +++ b/app/models/application_setting.rb @@ -10,7 +10,9 @@ class ApplicationSetting < ApplicationRecord add_authentication_token_field :health_check_access_token add_authentication_token_field :static_objects_external_storage_auth_token - belongs_to :instance_administration_project, class_name: "Project" + belongs_to :self_monitoring_project, class_name: "Project", foreign_key: 'instance_administration_project_id' + alias_attribute :self_monitoring_project_id, :instance_administration_project_id + belongs_to :instance_administrators_group, class_name: "Group" # Include here so it can override methods from |