diff options
| author | GitLab Bot <gitlab-bot@gitlab.com> | 2023-02-24 15:09:55 +0000 |
|---|---|---|
| committer | GitLab Bot <gitlab-bot@gitlab.com> | 2023-02-24 15:09:55 +0000 |
| commit | fd9a56d56f84b36779fc4db2da37204c22585fe4 (patch) | |
| tree | c0b1ec9aa2f49aa5623bae34dfef4e286caf56b3 /app/models/application_setting.rb | |
| parent | 552e85a58645e5321b33dacc8d410fa88fb75a85 (diff) | |
| download | gitlab-ce-fd9a56d56f84b36779fc4db2da37204c22585fe4.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 | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/app/models/application_setting.rb b/app/models/application_setting.rb index c80ff359a69..7219374fe2a 100644 --- a/app/models/application_setting.rb +++ b/app/models/application_setting.rb @@ -30,11 +30,13 @@ class ApplicationSetting < MainClusterwide::ApplicationRecord add_authentication_token_field :static_objects_external_storage_auth_token, encrypted: :required add_authentication_token_field :error_tracking_access_token, encrypted: :required - belongs_to :self_monitoring_project, class_name: "Project", foreign_key: 'instance_administration_project_id' + belongs_to :self_monitoring_project, class_name: "Project", foreign_key: :instance_administration_project_id, + inverse_of: :application_setting belongs_to :push_rule alias_attribute :self_monitoring_project_id, :instance_administration_project_id - belongs_to :instance_group, class_name: "Group", foreign_key: 'instance_administrators_group_id' + belongs_to :instance_group, class_name: "Group", foreign_key: :instance_administrators_group_id, + inverse_of: :application_setting alias_attribute :instance_group_id, :instance_administrators_group_id alias_attribute :instance_administrators_group, :instance_group alias_attribute :housekeeping_optimize_repository_period, :housekeeping_incremental_repack_period |