app/controllers · a839b2afc40d09d1867fea4ff8cd00b0a4d88f9e · 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
..
admin		Loading commit data...
concerns		Loading commit data...
dashboard		Loading commit data...
explore		Loading commit data...
groups		Loading commit data...
import		Loading commit data...
oauth		Loading commit data...
profiles		Loading commit data...
projects		Loading commit data...
application_controller.rb		Loading commit data...
autocomplete_controller.rb		Loading commit data...
confirmations_controller.rb		Loading commit data...
dashboard_controller.rb		Loading commit data...
groups_controller.rb		Loading commit data...
help_controller.rb		Loading commit data...
invites_controller.rb		Loading commit data...
namespaces_controller.rb		Loading commit data...
omniauth_callbacks_controller.rb		Loading commit data...
passwords_controller.rb		Loading commit data...
profiles_controller.rb		Loading commit data...
projects_controller.rb		Loading commit data...
registrations_controller.rb		Loading commit data...
root_controller.rb		Loading commit data...
search_controller.rb		Loading commit data...
sessions_controller.rb		Loading commit data...
snippets_controller.rb		Loading commit data...
uploads_controller.rb		Loading commit data...
users_controller.rb		Loading commit data...