Skip to content

G
gitlab-ce
Commit 4cf67df7 authored by Stan Hu's avatar Stan Hu
Browse files
Options

Resolve conflict in app/controllers/sessions_controller.rb

parent 11f81cc1
Hide whitespace changes
Inline Side-by-side
Showing with 0 additions and 3 deletions
app/controllers/sessions_controller.rb
View file @ 4cf67df7
...@@ -4,10 +4,7 @@ class SessionsController < Devise::SessionsController ...@@ -4,10 +4,7 @@ class SessionsController < Devise::SessionsController
include Devise::Controllers::Rememberable include Devise::Controllers::Rememberable
include Recaptcha::ClientHelper include Recaptcha::ClientHelper
include Recaptcha::Verify include Recaptcha::Verify
<<<<<<< HEAD
prepend EE::SessionsController prepend EE::SessionsController
=======
>>>>>>> upstream/master
skip_before_action :check_two_factor_requirement, only: [:destroy] skip_before_action :check_two_factor_requirement, only: [:destroy]
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment
GitLab Nexedi Edition | About GitLab | About Nexedi | 沪ICP备2021021310号-2 | 沪ICP备2021021310号-7