Commit Graph

11 Commits

Author SHA1 Message Date
GitLab Bot a5ab3467a7 Add latest changes from gitlab-org/gitlab@master 2020-01-13 15:07:53 +00:00
Heinrich Lee Yu aeb67dd489 Upgrade to Rails 5.2
Updates changed method names and fixes spec failures
2019-07-12 10:15:31 +08:00
Andrew Newdigate 26140f9185 In dev, always allow access to health endpoints from localhost
This change will allow developers to easily hook up a Prometheus
instance to their local development instance, without making any
configuration changes.
2019-06-26 09:27:19 +00:00
gfyoung 73322a0e55 Enable frozen string in app/controllers/**/*.rb
Enables frozen string for the following:

* app/controllers/*.rb
* app/controllers/admin/**/*.rb
* app/controllers/boards/**/*.rb
* app/controllers/ci/**/*.rb
* app/controllers/concerns/**/*.rb

Partially addresses #47424.
2018-09-18 21:22:45 -07:00
Mario de la Ossa eaada9d706 use Gitlab::UserSettings directly as a singleton instead of including/extending it 2018-02-02 18:39:55 +00:00
Sean McGivern 5883ce95ef `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.
2017-08-31 13:38:33 +01:00
Pawel Chojnacki 2951a09967 Add tests for token auth. 2017-07-06 15:43:57 +02:00
Pawel Chojnacki 2f875c4037 Finish refactring processed configuraiton, and add test validating ip range matching 2017-07-05 00:46:12 +02:00
Pawel Chojnacki de6c3597ab correctly handle transforming settings into useful datastructure 2017-07-05 00:46:12 +02:00
Pawel Chojnacki c1b043bdb7 Bring back healthcheck token access to monitoring resources, but mark this as deprecated 2017-07-05 00:46:11 +02:00
Pawel Chojnacki 18521584bd Remove the need to use health check token
in favor of whitelist that will be used to
control the access to monitoring resources
2017-07-05 00:46:11 +02:00