diff options
| author | GitLab Bot <gitlab-bot@gitlab.com> | 2020-01-13 21:07:39 +0000 |
|---|---|---|
| committer | GitLab Bot <gitlab-bot@gitlab.com> | 2020-01-13 21:07:39 +0000 |
| commit | 74a89b1221eaf780374bd1d4c5b2ee4a0f488908 (patch) | |
| tree | 27dbcfdbc4216e9bee04b9be9c974d86744d51ba /app/models/application_setting.rb | |
| parent | b0abae12affecc466aeb10889e8a6c000d6f67f5 (diff) | |
| download | gitlab-ce-74a89b1221eaf780374bd1d4c5b2ee4a0f488908.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 | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/app/models/application_setting.rb b/app/models/application_setting.rb index a0a600a340e..10d15e84b8d 100644 --- a/app/models/application_setting.rb +++ b/app/models/application_setting.rb @@ -11,6 +11,7 @@ class ApplicationSetting < ApplicationRecord add_authentication_token_field :static_objects_external_storage_auth_token belongs_to :instance_administration_project, class_name: "Project" + belongs_to :instance_administrators_group, class_name: "Group" # Include here so it can override methods from # `add_authentication_token_field` |