Robert Speicher d2de219f6c Merge branch 'add-2fa-status-to-admin-api' into 'master' ...

Add 2FA status to user admin API

This MR adds the `two_factor_enabled` field to the admin's API to indicate whether a given user has enabled 2FA.

See merge request !881

2015-06-24 19:24:20 +00:00

..

controllers

Fix error when deleting a user who has projects

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

factories

Fix Style/AsciiComments cop violation

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

features

Merge branch 'rubocop-for-tests' into 'master'

2015-06-23 10:36:36 +00: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 'master' into rubocop-for-tests

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

javascripts

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

2015-06-22 09:48:49 +00:00

lib

Merge branch 'master' into rubocop-for-tests

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

mailers

Merge branch 'master' into rubocop-for-tests

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

models

Only look up Commit authors/committers by email

2015-06-23 18:07:15 -04:00

requests/api

Add 2FA status to user admin API

2015-06-23 22:41:59 -07:00

routing

Fix Style/TrailingBlankLines cop violations

2015-06-22 14:38:33 -04:00

services

Merge branch 'master' into rubocop-for-tests

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

support

Fix rubocop issues after merge of recent master

2015-06-23 10:46:29 +02: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 convenience methods to User for getting and setting 2FA status

2015-06-19 14:59:42 -04:00

rails_helper.rb

Started on the actual rspec 3 upgrade

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

spec_helper.rb

Update email_spec gem

2015-06-22 12:13:46 +02:00

teaspoon_env.rb

teaspoon install

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