summaryrefslogtreecommitdiff
path: root/app/models/concerns/has_status.rb
diff options
context:
space:
mode:
authorRobert Speicher <robert@gitlab.com>2016-08-24 23:45:32 +0000
committerRobert Speicher <robert@gitlab.com>2016-08-24 23:45:32 +0000
commit6fb46b604e4feebcbaa92d3d44d7616be709c0e5 (patch)
treeb9388714a34dfb2aec72f71ab158a93a85bbc817 /app/models/concerns/has_status.rb
parent9ea01f32fe4355179da6082742b6ad06f9603388 (diff)
parentbba85773519e972d036a933b1f054b6c76050c5f (diff)
downloadgitlab-ce-6fb46b604e4feebcbaa92d3d44d7616be709c0e5.tar.gz
Merge branch 'internal_recovery_api' into 'master'
Add internal API to recovery 2FA ## What does this MR do? Add an internal API to make SSH 2FA recovery possible. Related to gitlab-org/gitlab-shell!74 See merge request !5510
Diffstat (limited to 'app/models/concerns/has_status.rb')
0 files changed, 0 insertions, 0 deletions