diff options
author | GitLab Bot <gitlab-bot@gitlab.com> | 2020-11-16 15:09:23 +0000 |
---|---|---|
committer | GitLab Bot <gitlab-bot@gitlab.com> | 2020-11-16 15:09:23 +0000 |
commit | 01a8b31afeac9ac1eaf64d781de5ee8f15eb1897 (patch) | |
tree | 3c4404c0c68ca2cb8fa9564727a95bcbad7ab086 /lib/gitlab/current_settings.rb | |
parent | 127e6d9610b96f470ef4da2f7b5936211974fd17 (diff) | |
download | gitlab-ce-01a8b31afeac9ac1eaf64d781de5ee8f15eb1897.tar.gz |
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'lib/gitlab/current_settings.rb')
-rw-r--r-- | lib/gitlab/current_settings.rb | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/lib/gitlab/current_settings.rb b/lib/gitlab/current_settings.rb index 2b08d3c63bb..d0579a44219 100644 --- a/lib/gitlab/current_settings.rb +++ b/lib/gitlab/current_settings.rb @@ -16,8 +16,8 @@ module Gitlab @in_memory_application_settings = nil end - def method_missing(name, *args, &block) - current_application_settings.send(name, *args, &block) # rubocop:disable GitlabSecurity/PublicSend + def method_missing(name, *args, **kwargs, &block) + current_application_settings.send(name, *args, **kwargs, &block) # rubocop:disable GitlabSecurity/PublicSend end def respond_to_missing?(name, include_private = false) |