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

..

application_controller.rb

Add helpers for header title and sidebar, and move setting those from controllers to layouts.

2015-05-01 10:39:16 +02:00

application_settings_controller.rb

session_expire_seconds => session_expire_delay

2015-06-10 22:10:00 -04:00

applications_controller.rb

Small improvements to CI

2015-01-17 16:17:34 -08:00

background_jobs_controller.rb

Use Gitlab.config instead of Settings everywhere

2014-10-15 23:01:31 +02:00

broadcast_messages_controller.rb

Fixed the Rails/ActionFilter cop

2015-04-20 15:39:37 +02:00

dashboard_controller.rb

Explicitly define ordering in models using default_scope

2015-02-05 14:20:55 -08:00

deploy_keys_controller.rb

Remove show actions from Admin and Project DeployKeys

2015-06-03 18:03:04 -04:00

groups_controller.rb

Wrap group removal into service

2015-06-03 14:07:20 +02:00

hooks_controller.rb

Added X-GitLab-Event header for web hooks

2015-05-08 16:49:03 +03:00

identities_controller.rb

Fix admin identities code

2015-06-23 10:26:50 +02:00

keys_controller.rb

Fixed the Rails/ActionFilter cop

2015-04-20 15:39:37 +02:00

logs_controller.rb

Added the correct hierarchy of controllers for the administrative part

2013-01-24 22:31:24 +02:00

projects_controller.rb

Fix transferring of project to another group using the API.

2015-07-11 16:47:33 -04:00

services_controller.rb

Fix bug where Slack service channel was not saved in admin template settings.

2015-04-24 08:33:24 -07:00

users_controller.rb

Add disable_two_factor route for Admin::Users

2015-07-10 17:18:17 -04:00