diff options
| author | Grzegorz Bizon <grzesiek.bizon@gmail.com> | 2018-07-27 12:29:49 +0200 |
|---|---|---|
| committer | Grzegorz Bizon <grzesiek.bizon@gmail.com> | 2018-07-27 12:29:49 +0200 |
| commit | c44541a506347225539afeb2e124f3210c8b2065 (patch) | |
| tree | 288f287a710dc14d6f0e973bf77ee14e0f30a92e | |
| parent | ede8c0ced46c67a554a90829c5b65b26f0168c67 (diff) | |
| download | gitlab-ce-c44541a506347225539afeb2e124f3210c8b2065.tar.gz | |
Improve readability and move custom matchers to better place
| -rw-r--r-- | lib/gitlab/auth/activity.rb | 4 | ||||
| -rw-r--r-- | spec/support/matchers/metric_counter_matcher.rb (renamed from spec/support/prometheus/custom_matchers.rb) | 0 |
2 files changed, 1 insertions, 3 deletions
diff --git a/lib/gitlab/auth/activity.rb b/lib/gitlab/auth/activity.rb index e09ba2eeabc..d5d1428ba58 100644 --- a/lib/gitlab/auth/activity.rb +++ b/lib/gitlab/auth/activity.rb @@ -32,9 +32,7 @@ module Gitlab self.class.user_password_invalid_counter_increment! end - if @user.present? && @user.blocked? - self.class.user_blocked_counter_increment! - end + self.class.user_blocked_counter_increment! if @user&.blocked? end def user_authenticated! diff --git a/spec/support/prometheus/custom_matchers.rb b/spec/support/matchers/metric_counter_matcher.rb index 22d5cd17e3f..22d5cd17e3f 100644 --- a/spec/support/prometheus/custom_matchers.rb +++ b/spec/support/matchers/metric_counter_matcher.rb |