diff options
| author | GitLab Bot <gitlab-bot@gitlab.com> | 2022-11-02 12:11:04 +0000 |
|---|---|---|
| committer | GitLab Bot <gitlab-bot@gitlab.com> | 2022-11-02 12:11:04 +0000 |
| commit | ed509186782d16d2bbcb34ac73303e8cb3a9d5a2 (patch) | |
| tree | 4ab3bbb33b37e9e4c0f73627617ea6b0c7d0d7f7 /app/models/application_setting_implementation.rb | |
| parent | 44837830832a41a6fe6360aca18e50826c723fd1 (diff) | |
| download | gitlab-ce-ed509186782d16d2bbcb34ac73303e8cb3a9d5a2.tar.gz | |
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'app/models/application_setting_implementation.rb')
| -rw-r--r-- | app/models/application_setting_implementation.rb | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/app/models/application_setting_implementation.rb b/app/models/application_setting_implementation.rb index d78c6d4a503..308c05d638c 100644 --- a/app/models/application_setting_implementation.rb +++ b/app/models/application_setting_implementation.rb @@ -62,6 +62,7 @@ module ApplicationSettingImplementation diff_max_patch_bytes: Gitlab::Git::Diff::DEFAULT_MAX_PATCH_BYTES, diff_max_files: Commit::DEFAULT_MAX_DIFF_FILES_SETTING, diff_max_lines: Commit::DEFAULT_MAX_DIFF_LINES_SETTING, + disable_admin_oauth_scopes: false, disable_feed_token: false, disabled_oauth_sign_in_sources: [], dns_rebinding_protection_enabled: true, |