-
- Downloads
There was an error fetching the commit references. Please try again later.
`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.
Showing
- app/controllers/concerns/requires_whitelisted_monitoring_client.rb 3 additions, 0 deletions...ollers/concerns/requires_whitelisted_monitoring_client.rb
- app/helpers/application_helper.rb 1 addition, 1 deletionapp/helpers/application_helper.rb
- app/helpers/application_settings_helper.rb 3 additions, 0 deletionsapp/helpers/application_settings_helper.rb
- app/helpers/auth_helper.rb 2 additions, 0 deletionsapp/helpers/auth_helper.rb
- app/helpers/projects_helper.rb 2 additions, 0 deletionsapp/helpers/projects_helper.rb
- app/mailers/base_mailer.rb 3 additions, 1 deletionapp/mailers/base_mailer.rb
- app/models/concerns/spammable.rb 1 addition, 1 deletionapp/models/concerns/spammable.rb
- app/models/project.rb 1 addition, 0 deletionsapp/models/project.rb
- app/models/protected_branch.rb 2 additions, 0 deletionsapp/models/protected_branch.rb
- app/models/snippet.rb 2 additions, 0 deletionsapp/models/snippet.rb
- app/models/user.rb 1 addition, 0 deletionsapp/models/user.rb
- app/policies/base_policy.rb 1 addition, 3 deletionsapp/policies/base_policy.rb
- app/services/akismet_service.rb 2 additions, 0 deletionsapp/services/akismet_service.rb
- app/services/auth/container_registry_authentication_service.rb 1 addition, 1 deletion...ervices/auth/container_registry_authentication_service.rb
- app/services/projects/update_pages_service.rb 2 additions, 0 deletionsapp/services/projects/update_pages_service.rb
- app/services/upload_service.rb 2 additions, 0 deletionsapp/services/upload_service.rb
- app/services/users/build_service.rb 2 additions, 0 deletionsapp/services/users/build_service.rb
- config/initializers/sentry.rb 2 additions, 3 deletionsconfig/initializers/sentry.rb
- config/initializers/session_store.rb 1 addition, 2 deletionsconfig/initializers/session_store.rb
- lib/api/helpers/runner.rb 2 additions, 0 deletionslib/api/helpers/runner.rb
Please register or sign in to comment