Improve readability and move custom matchers to better place

c44541a5 · Grzegorz Bizon · ede8c0ce · c44541a5 · c44541a5
Commit c44541a5 authored Jul 27, 2018 by Grzegorz Bizon
Hide whitespace changes
Inline Side-by-side

Showing with 1 addition and 3 deletions

lib/gitlab/auth/activity.rb lib/gitlab/auth/activity.rb +1 -3

spec/support/matchers/metric_counter_matcher.rb spec/support/matchers/metric_counter_matcher.rb +0 -0

No files found.
--- 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! if @user&.blocked?
-          self.class.user_blocked_counter_increment!
-        end
      end
      def user_authenticated!

--- a/spec/support/prometheus/custom_matchers.rb
+++ b/spec/support/prometheus/custom_matchers.rb