Commit Graph

17 Commits

Author SHA1 Message Date
GitLab Bot c8cc2fe990 Add latest changes from gitlab-org/gitlab@master 2021-06-18 15:10:16 +00:00
GitLab Bot 39c1496527 Add latest changes from gitlab-org/gitlab@master 2021-01-13 12:10:27 +00:00
Jasper Maes 1bb4ad9262 Fix deprecation: render :text is deprecated because it does not actually render a text/plain response 2018-11-29 08:05:13 +01: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
blackst0ne 6fef87f17f [Rails5] Force the `protect_from_forgery` callback run first
Since Rails 5.0 the `protect_from_forgery` callback doesn't run first by
default anymore. [1]

Instead it gets inserted into callbacks chain where callbacks get
called in order.

This commit forces the callback to run first.

[1]: 3979403781
2018-06-21 21:44:31 +11:00
🙈 jacopo beschi 🙉 729f05f0e3 Adds Rubocop rule for line break around conditionals 2018-01-11 16:34:01 +00:00
Pawel Chojnacki 1ea2a85cbe Make Prometheus metrics endpoint return empty response when metrics are disabled 2017-09-25 23:38:34 +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
Pawel Chojnacki c134a72cdb Move Prometheus presentation logic to PrometheusText
+ Use NullMetrics to mock metrics when unused
+ Use method_missing in NullMetrics mocking
+ Update prometheus gem to version that correctly uses transitive dependencies
+ Ensure correct folders are used in Multiprocess prometheus client tests.
+ rename Sessions controller's metric
2017-06-02 19:45:58 +02:00
Pawel Chojnacki 770f07cd5c Make login_counter instance variable instead of class one.
+ remove unecessarey require
 + fix small formatiing issues
2017-06-02 19:45:58 +02:00
Pawel Chojnacki 254830c1f9 Move most of MetricsController logic to MetricsService 2017-06-02 19:45:58 +02:00
Pawel Chojnacki 466beeb31f Use interpolation instead of concatenation 2017-06-02 19:45:58 +02:00
Pawel Chojnacki 62fe37e3f8 move check if metrics are enabled to before action 2017-06-02 19:45:58 +02:00
Pawel Chojnacki 21561f3434 Correctly handle temporary folder for testing multiproces metrics 2017-06-02 19:45:58 +02:00
Pawel Chojnacki c10d55a6da Use only ENV for metrics folder location 2017-06-02 19:45:58 +02:00
Pawel Chojnacki 6726922890 Bring back the token 2017-06-02 19:45:58 +02:00
Pawel Chojnacki 0f4050430d Split metrics from health controller into metrics controller 2017-06-02 19:45:58 +02:00