Add latest changes from gitlab-org/gitlab@master

1 files changed, 8 insertions, 0 deletions

diff --git a/lib/gitlab/devise_failure.rb b/lib/gitlab/devise_failure.rb
index 4d27b706e1e..59a7c4a6660 100644
--- a/lib/gitlab/devise_failure.rb
+++ b/lib/gitlab/devise_failure.rb
@@ -2,6 +2,8 @@
 
 module Gitlab
   class DeviseFailure < Devise::FailureApp
+    include ::SessionsHelper
+
     # If the request format is not known, send a redirect instead of a 401
     # response, since this is the outcome we're most likely to want
     def http_auth?
@@ -9,5 +11,11 @@ module Gitlab
 
       request_format && super
     end
+
+    def respond
+      limit_session_time
+
+      super
+    end
   end
 end