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

..

controllers

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

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

factories

Fix Style/AsciiComments cop violation

2015-06-22 14:43:51 -04:00

features

Add a button to Admin::Users#show to disable 2FA for that user

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

finders

Set milestone on new issue when creating issue from index with milestone filter active.

2015-05-27 14:22:11 +02:00

fixtures

Add ExternalLinkFilter to Markdown pipeline

2015-05-27 15:39:08 -04:00

helpers

Merge branch 'fork_visibility_level' into 'master'

2015-07-10 12:05:54 +00:00

javascripts

Remove disableButtonIf[Any]EmptyField calls from forms

2015-06-26 22:07:59 -04:00

lib

Extract the longest-matching ref from a commit path when multiple matches occur

2015-07-01 07:01:59 -07:00

mailers

Merge branch 'master' into rubocop-for-tests

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

models

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

2015-07-13 08:47:55 +00:00

requests/api

Merge branch 'rs-dev-issue-2372' into 'master'

2015-07-08 21:42:29 +00:00

routing

Audit log for user authentication

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

services

Update specs.

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

support

Use stub_application_setting in a few more specs

2015-07-06 22:39:56 -04:00

tasks/gitlab

Fix rubocop issues after merge of recent master

2015-06-23 10:46:29 +02:00

workers

Merge branch 'master' into rubocop-for-tests

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

factories_spec.rb

Remove the invalid key factories

2015-04-11 17:12:10 -04:00

factories.rb

Add User#disable_two_factor!

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

rails_helper.rb

Started on the actual rspec 3 upgrade

2015-06-22 12:12:49 +02:00

spec_helper.rb

Fix ApplicationHelper specs

2015-06-30 17:47:53 -04:00

teaspoon_env.rb

teaspoon install

2015-05-28 18:22:32 -04:00