diff options
| author | Pawel Chojnacki <pawel@chojnacki.ws> | 2017-05-29 14:19:43 +0200 |
|---|---|---|
| committer | Pawel Chojnacki <pawel@chojnacki.ws> | 2017-06-02 19:45:58 +0200 |
| commit | c134a72cdb7e6de8b70dc60de99cf4edc68a9227 (patch) | |
| tree | 0082ba4d422cc53eea223583bca9c98cbc823c96 /app/controllers/sessions_controller.rb | |
| parent | 770f07cd5c68075bb261f4b6139c92b2ac9309c0 (diff) | |
| download | gitlab-ce-c134a72cdb7e6de8b70dc60de99cf4edc68a9227.tar.gz | |
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
Diffstat (limited to 'app/controllers/sessions_controller.rb')
| -rw-r--r-- | app/controllers/sessions_controller.rb | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/app/controllers/sessions_controller.rb b/app/controllers/sessions_controller.rb index fc9de30f256..ab52b676e01 100644 --- a/app/controllers/sessions_controller.rb +++ b/app/controllers/sessions_controller.rb @@ -48,7 +48,7 @@ class SessionsController < Devise::SessionsController private def login_counter - @login_counter ||= Gitlab::Metrics.counter(:user_session_logins, 'User logins count') + @login_counter ||= Gitlab::Metrics.counter(:user_session_logins, 'User sign in count') end # Handle an "initial setup" state, where there's only one user, it's an admin, |