Remove unecessary defaults for uniq ip block, cleanup refactoring leftovers

2 files changed, 2 insertions, 3 deletions

diff --git a/lib/gitlab/auth/unique_ips_limiter.rb b/lib/gitlab/auth/unique_ips_limiter.rb
index 4d401eb1b5d..bf2239ca150 100644
--- a/lib/gitlab/auth/unique_ips_limiter.rb
+++ b/lib/gitlab/auth/unique_ips_limiter.rb
@@ -8,12 +8,13 @@ module Gitlab
           if config.unique_ips_limit_enabled
             ip = RequestContext.client_ip
             unique_ips = update_and_return_ips_count(user_id, ip)
+
             raise TooManyIps.new(user_id, ip, unique_ips) if unique_ips > config.unique_ips_limit_per_user
           end
         end
 
         def limit_user!(user = nil)
-          user = yield if user.nil? && block_given?
+          user ||= yield if block_given?
           limit_user_id!(user.id) unless user.nil?
           user
         end
diff --git a/lib/gitlab/request_context.rb b/lib/gitlab/request_context.rb
index 1dce18d1733..fef536ecb0b 100644
--- a/lib/gitlab/request_context.rb
+++ b/lib/gitlab/request_context.rb
@@ -1,6 +1,4 @@
 module Gitlab
-  RequestStoreNotActive = Class.new(StandardError)
-
   class RequestContext
     class << self
       def client_ip