diff options
| author | Sean McGivern <sean@gitlab.com> | 2017-08-31 10:47:03 +0100 |
|---|---|---|
| committer | Sean McGivern <sean@gitlab.com> | 2017-08-31 13:38:33 +0100 |
| commit | 5883ce95efcc4cc04f949f9b4e66d73fbede94e2 (patch) | |
| tree | d02417158bec75160367f5b7663d37043eca9d57 /app/controllers/concerns | |
| parent | bf51ab887b92275d0e5b51c53889664f8c8db745 (diff) | |
| download | gitlab-ce-5883ce95efcc4cc04f949f9b4e66d73fbede94e2.tar.gz | |
`current_application_settings` belongs on `Gitlab::CurrentSettings`
The initializers including this were doing so at the top level, so every object
loaded after them had a `current_application_settings` method. However, if
someone had rack-attack enabled (which was loaded before these initializers), it
would try to load the API, and fail, because `Gitlab::CurrentSettings` didn't
have that method.
To fix this:
1. Don't include `Gitlab::CurrentSettings` at the top level. We do not need
`Object.new.current_application_settings` to work.
2. Make `Gitlab::CurrentSettings` explicitly `extend self`, as we already use it
like that in several places.
3. Change the initializers to use that new form.
Diffstat (limited to 'app/controllers/concerns')
| -rw-r--r-- | app/controllers/concerns/requires_whitelisted_monitoring_client.rb | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/app/controllers/concerns/requires_whitelisted_monitoring_client.rb b/app/controllers/concerns/requires_whitelisted_monitoring_client.rb index ad2f4bbc486..0218ac83441 100644 --- a/app/controllers/concerns/requires_whitelisted_monitoring_client.rb +++ b/app/controllers/concerns/requires_whitelisted_monitoring_client.rb @@ -1,5 +1,8 @@ module RequiresWhitelistedMonitoringClient extend ActiveSupport::Concern + + include Gitlab::CurrentSettings + included do before_action :validate_ip_whitelisted_or_valid_token! end |