app/controllers/admin · 427b5df260cffdfcae5caa4662c7fc38631b48a3 · Forest Godfrey / gitlab-ce

Merge branch 'rs-disable-2fa-by-admin' into 'master' · 171d6fcc

authored Jul 13, 2015

Allow admins to disable 2FA for a user

> ![Screen_Shot_2015-07-10_at_5.19.13_PM](https://gitlab.com/gitlab-org/gitlab-ce/uploads/3f9bb7c783110d2689c282879cb4b061/Screen_Shot_2015-07-10_at_5.19.13_PM.png)

Depends on !961

See merge request !962

171d6fcc

Name	Last commit	Last update
..
application_controller.rb		Loading commit data...
application_settings_controller.rb		Loading commit data...
applications_controller.rb		Loading commit data...
background_jobs_controller.rb		Loading commit data...
broadcast_messages_controller.rb		Loading commit data...
dashboard_controller.rb		Loading commit data...
deploy_keys_controller.rb		Loading commit data...
groups_controller.rb		Loading commit data...
hooks_controller.rb		Loading commit data...
identities_controller.rb		Loading commit data...
keys_controller.rb		Loading commit data...
logs_controller.rb		Loading commit data...
projects_controller.rb		Loading commit data...
services_controller.rb		Loading commit data...
users_controller.rb		Loading commit data...