summaryrefslogtreecommitdiff
path: root/app/models
diff options
context:
space:
mode:
authorRobert Speicher <robert@gitlab.com>2015-06-24 19:24:20 +0000
committerRobert Speicher <robert@gitlab.com>2015-06-24 19:24:20 +0000
commitd2de219f6cf5d6ce371f529988f9337653878e58 (patch)
treeb37da0f9b071353cfaaf097804951f262a95be2d /app/models
parentc465af093096990ee42b3021fce157d02b8864cb (diff)
parent6548e9b48c079bb29cfe61eff99179e880583641 (diff)
downloadgitlab-ce-d2de219f6cf5d6ce371f529988f9337653878e58.tar.gz
Merge branch 'add-2fa-status-to-admin-api' into 'master'
Add 2FA status to user admin API This MR adds the `two_factor_enabled` field to the admin's API to indicate whether a given user has enabled 2FA. See merge request !881
Diffstat (limited to 'app/models')
0 files changed, 0 insertions, 0 deletions