diff options
| author | Sean McGivern <sean@gitlab.com> | 2017-08-31 12:47:03 +0300 |
|---|---|---|
| committer | Sean McGivern <sean@gitlab.com> | 2017-08-31 15:38:33 +0300 |
| commit | 5883ce95efcc4cc04f949f9b4e66d73fbede94e2 (patch) | |
| tree | d02417158bec75160367f5b7663d37043eca9d57 /lib/gitlab/performance_bar.rb | |
| parent | bf51ab887b92275d0e5b51c53889664f8c8db745 (diff) | |
`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 'lib/gitlab/performance_bar.rb')
| -rw-r--r-- | lib/gitlab/performance_bar.rb | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/lib/gitlab/performance_bar.rb b/lib/gitlab/performance_bar.rb index 56112ec2301..e73245b82c1 100644 --- a/lib/gitlab/performance_bar.rb +++ b/lib/gitlab/performance_bar.rb @@ -1,6 +1,6 @@ module Gitlab module PerformanceBar - include Gitlab::CurrentSettings + extend Gitlab::CurrentSettings ALLOWED_USER_IDS_KEY = 'performance_bar_allowed_user_ids:v2'.freeze EXPIRY_TIME = 5.minutes |