diff options
| author | GitLab Bot <gitlab-bot@gitlab.com> | 2020-03-13 15:09:22 +0300 |
|---|---|---|
| committer | GitLab Bot <gitlab-bot@gitlab.com> | 2020-03-13 15:09:22 +0300 |
| commit | 286fe61013674fe2d245ffc8d2233baf09923e70 (patch) | |
| tree | 2037291f5863105e54e75be056b49f7d62007cae /app/controllers/concerns | |
| parent | 4cb5e5011abfe8d50ac3a7ebd0018c563c6d7af4 (diff) | |
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'app/controllers/concerns')
| -rw-r--r-- | app/controllers/concerns/authenticates_with_two_factor.rb | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/app/controllers/concerns/authenticates_with_two_factor.rb b/app/controllers/concerns/authenticates_with_two_factor.rb index 6f0c7abac16..b885e55f902 100644 --- a/app/controllers/concerns/authenticates_with_two_factor.rb +++ b/app/controllers/concerns/authenticates_with_two_factor.rb @@ -3,8 +3,6 @@ # == AuthenticatesWithTwoFactor # # Controller concern to handle two-factor authentication -# -# Upon inclusion, skips `require_no_authentication` on `:create`. module AuthenticatesWithTwoFactor extend ActiveSupport::Concern |