Merge remote-tracking branch 'origin/release/7.4' into dev

[ci skip]

lib/open_project/openid_connect/sso_logout.rb

@@ -13,7 +13,7 @@ module OpenProject
       # If not call super which will reset the session, set
       # the new user, and redirect to some page the script the
       # reauthentication doesn't care about.
-      def successful_authentication(user)
+      def successful_authentication(user, reset_stages: true)
         if reauthentication?
           finish_reauthentication!
         else

openproject-openid_connect.gemspec

@@ -18,4 +18,5 @@ Gem::Specification.new do |s|
   s.add_dependency 'rails', '~> 5.0'
   s.add_dependency 'openproject-auth_plugins', '~> 8.0'
   s.add_dependency 'omniauth-openid_connect-providers', '~> 0.1'
+  s.add_dependency 'lobby_boy', '~> 0.1.3'
 end