diff options
| author | GitLab Bot <gitlab-bot@gitlab.com> | 2021-02-05 16:20:45 +0000 |
|---|---|---|
| committer | GitLab Bot <gitlab-bot@gitlab.com> | 2021-02-05 16:20:45 +0000 |
| commit | d298fad0c0564454271cba11e6f20c19681534ac (patch) | |
| tree | 0a19d07d8b3bdd2574617305c300e404f2ace581 /lib/api/entities/application_setting.rb | |
| parent | c9f9eec79cab801a50db698f682aacffbedf07f7 (diff) | |
| download | gitlab-ce-13.9.0-rc41.tar.gz | |
Add latest changes from gitlab-org/gitlab@13-9-stable-eev13.9.0-rc41
Diffstat (limited to 'lib/api/entities/application_setting.rb')
| -rw-r--r-- | lib/api/entities/application_setting.rb | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/lib/api/entities/application_setting.rb b/lib/api/entities/application_setting.rb index e9572a8d430..2468c1f9b18 100644 --- a/lib/api/entities/application_setting.rb +++ b/lib/api/entities/application_setting.rb @@ -31,6 +31,7 @@ module API expose :password_authentication_enabled_for_web, as: :password_authentication_enabled expose :password_authentication_enabled_for_web, as: :signin_enabled expose :allow_local_requests_from_web_hooks_and_services, as: :allow_local_requests_from_hooks_and_services + expose :asset_proxy_allowlist, as: :asset_proxy_whitelist end end end |