gitlab-ce/app
Dmitriy Zaporozhets 171d6fccae Merge branch 'rs-disable-2fa-by-admin' into 'master'
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
2015-07-13 08:49:46 +00:00
..
assets Do not add the same icon multiple times to dropzones 2015-07-10 19:46:40 +02:00
controllers Merge branch 'rs-disable-2fa-by-admin' into 'master' 2015-07-13 08:49:46 +00:00
finders Rename NoMilestone to Milestone::None 2015-07-06 22:39:55 -04:00
helpers Merge branch 'fork_visibility_level' into 'master' 2015-07-10 12:05:54 +00:00
mailers
models Merge branch 'rs-disable-2fa' into 'master' 2015-07-13 08:47:55 +00:00
services Fix transferring of project to another group using the API. 2015-07-11 16:47:33 -04:00
uploaders
views Merge branch 'rs-disable-2fa-by-admin' into 'master' 2015-07-13 08:49:46 +00:00
workers Add Irker service configuration options 2015-07-05 06:40:56 -07:00