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

Add disable_two_factor route for Admin::Users

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

groups

Fix bug where avatar filenames were not actually deleted from the database during removal.

2015-05-07 10:00:35 -07:00

import

Merge branch 'master' into rubocop-for-tests

2015-06-23 10:44:03 +02:00

profiles

Add User#disable_two_factor!

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

projects

Merge branch 'master' into rubocop-for-tests

2015-06-23 10:44:03 +02:00

application_controller_spec.rb

Fix 403 Access Denied error messages when accessing Labels section in a project that has MRs disabled but issues enabled

2015-06-18 03:15:05 -07:00

autocomplete_controller_spec.rb

Better handle unknown projects and groups for autocomplete

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

blob_controller_spec.rb

Fix Style/AlignHash cop violations

2015-06-22 22:24:39 -07:00

branches_controller_spec.rb

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

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

commit_controller_spec.rb

Merge branch 'master' into rubocop-for-tests

2015-06-23 10:44:03 +02:00

commits_controller_spec.rb

Fix Style/AlignHash cop violations

2015-06-22 22:24:39 -07:00

help_controller_spec.rb

Fix Style/AlignHash cop violations

2015-06-22 22:24:39 -07:00

namespaces_controller_spec.rb

Add tests.

2015-03-27 10:27:13 +01:00

profile_keys_controller_spec.rb

Fix /:username.keys response content type

2014-03-20 19:09:14 +04:00

projects_controller_spec.rb

Fix Style/AlignHash cop violations

2015-06-22 22:24:39 -07:00

root_controller_spec.rb

Add RootController

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

tree_controller_spec.rb

Fix Style/AlignHash cop violations

2015-06-22 22:24:39 -07:00

uploads_controller_spec.rb

Reject access to group/project avatar if the user doesn't have access.

2015-03-10 17:13:02 +01:00

users_controller_spec.rb

Fix user controller specs

2015-03-22 11:14:42 -07:00