diff options
| author | Robert Speicher <robert@gitlab.com> | 2015-06-24 19:24:20 +0000 |
|---|---|---|
| committer | Robert Speicher <robert@gitlab.com> | 2015-06-24 19:24:20 +0000 |
| commit | d2de219f6cf5d6ce371f529988f9337653878e58 (patch) | |
| tree | b37da0f9b071353cfaaf097804951f262a95be2d /spec | |
| parent | c465af093096990ee42b3021fce157d02b8864cb (diff) | |
| parent | 6548e9b48c079bb29cfe61eff99179e880583641 (diff) | |
| download | gitlab-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 'spec')
| -rw-r--r-- | spec/requests/api/users_spec.rb | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/spec/requests/api/users_spec.rb b/spec/requests/api/users_spec.rb index c10998e171f..1a29058f3f1 100644 --- a/spec/requests/api/users_spec.rb +++ b/spec/requests/api/users_spec.rb @@ -35,6 +35,7 @@ describe API::API, api: true do expect(json_response.first.keys).to include 'email' expect(json_response.first.keys).to include 'identities' expect(json_response.first.keys).to include 'can_create_project' + expect(json_response.first.keys).to include 'two_factor_enabled' end end end |