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

..

admin

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

2015-07-13 08:49:46 +00:00

concerns

Refactor SessionsController to use a controller concern

2015-05-14 14:24:05 -04:00

dashboard

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

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

explore

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

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

groups

User should be able to leave group. If not - show him proper message

2015-05-29 14:12:30 +02:00

import

Show incompatible projects in Google Code import status

2015-04-30 06:56:49 -07:00

oauth

Correctly show anonymous authorized applications under Profile > Applications.

2015-07-02 11:53:31 +02:00

profiles

Add User#disable_two_factor!

2015-07-10 16:18:30 -04:00

projects

Return 40x error codes if branch could not be deleted in UI

2015-07-06 09:47:22 -07:00

application_controller.rb

Only enable HSTS header for HTTPS and port 443

2015-07-12 21:37:10 -07:00

autocomplete_controller.rb

Better handle unknown projects and groups for autocomplete

2015-07-11 06:19:32 -07:00

confirmations_controller.rb

Add invites controller.

2015-04-14 12:07:33 +02:00

dashboard_controller.rb

projects doesn't seem to be a valid action in this controller

2015-05-16 23:04:45 +10:00

groups_controller.rb

Fix consistency issue in sidebars of Project and Group Settings.

2015-06-24 18:05:16 +02:00

help_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

invites_controller.rb

Add a page title to every page.

2015-04-30 19:12:15 +02:00

namespaces_controller.rb

Fixed the Rails/ActionFilter cop

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

omniauth_callbacks_controller.rb

Audit log for user authentication

2015-07-06 12:36:08 +03:00

passwords_controller.rb

Use User#two_factor_enabled instead of otp_required_for_login

2015-06-19 15:14:37 -04:00

profiles_controller.rb

Merge branch 'audit_log' into 'master'

2015-07-06 10:09:53 +00:00

projects_controller.rb

Fix transferring of project to another group using the API.

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

registrations_controller.rb

Fix error when deleting a user who has projects

2015-06-23 04:39:49 -07:00

root_controller.rb

Refactor RootController

2015-06-13 17:59:13 -04:00

search_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

sessions_controller.rb

Audit log for user authentication

2015-07-06 12:36:08 +03:00

snippets_controller.rb

Update controller filters

2015-06-26 16:44:21 +02:00

uploads_controller.rb

Don't symbolize params.

2015-05-11 11:55:02 +02:00

users_controller.rb

Fix title on user page.

2015-05-01 11:33:54 +02:00