Improve readability and move custom matchers to better place

2018-07-27 12:29:49 +02:00 · 2018-07-27 12:29:49 +02:00 · c44541a506
parent ede8c0ced4
commit c44541a506
2 changed files with 1 additions and 3 deletions
--- 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!
--- a/spec/support/matchers/metric_counter_matcher.rb
+++ b/spec/support/matchers/metric_counter_matcher.rb