diff options
| author | GitLab Bot <gitlab-bot@gitlab.com> | 2020-04-15 15:42:17 +0000 |
|---|---|---|
| committer | GitLab Bot <gitlab-bot@gitlab.com> | 2020-04-15 15:42:17 +0000 |
| commit | 44fdf983bd35328dd577d3d3650d14163ef3e2b6 (patch) | |
| tree | 84ff300d056cfbabb5a0fe2a9cbaa80aaeab1cc5 /app/models/application_setting.rb | |
| parent | bc9fa07b26184b5c94808f704db6ea1ac81bf4de (diff) | |
| download | gitlab-ce-44fdf983bd35328dd577d3d3650d14163ef3e2b6.tar.gz | |
Add latest changes from gitlab-org/gitlab@12-10-stable-ee
Diffstat (limited to 'app/models/application_setting.rb')
| -rw-r--r-- | app/models/application_setting.rb | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/app/models/application_setting.rb b/app/models/application_setting.rb index c1e44748304..0aa0216558f 100644 --- a/app/models/application_setting.rb +++ b/app/models/application_setting.rb @@ -14,6 +14,7 @@ class ApplicationSetting < ApplicationRecord add_authentication_token_field :static_objects_external_storage_auth_token belongs_to :self_monitoring_project, class_name: "Project", foreign_key: 'instance_administration_project_id' + belongs_to :push_rule alias_attribute :self_monitoring_project_id, :instance_administration_project_id belongs_to :instance_administrators_group, class_name: "Group" |