diff options
author | GitLab Bot <gitlab-bot@gitlab.com> | 2020-05-01 00:09:47 +0300 |
---|---|---|
committer | GitLab Bot <gitlab-bot@gitlab.com> | 2020-05-01 00:09:47 +0300 |
commit | 3aeda4e6146bea1920c3283e98b01ca4fcf796a8 (patch) | |
tree | b44e6298a749bd8a02283bc5867ab4a3269b62c3 /config | |
parent | adafb996ef88da50b30c737cdb8caee8307ec6d6 (diff) |
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'config')
-rw-r--r-- | config/application.rb | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/config/application.rb b/config/application.rb index a135bef342a..d8f02277527 100644 --- a/config/application.rb +++ b/config/application.rb @@ -131,6 +131,7 @@ module Gitlab encrypted_key hook import_url + elasticsearch_url otp_attempt sentry_dsn trace |