Douwe Maan 204a989533 Merge branch 'rs-improve-grace-period' into 'master' ...

Don't show any "2FA required" message if it's not actually required

Prior, if the user had enabled and then disabled 2FA, they would be
shown a "You must enable Two-factor Authentication for your account."
message when going back to re-activate it, even if 2FA enforcement was
disabled.

See merge request !3014

2016-03-01 16:01:18 +00:00

..

assets

Merge branch 'issue_13851' into 'master'

2016-03-01 10:54:17 +00:00

controllers

Merge branch 'rs-improve-grace-period' into 'master'

2016-03-01 16:01:18 +00:00

finders

Rename Tasks to Todos

2016-02-20 12:39:27 -02:00

helpers

Merge branch 'mr-prefix-activity-view' into 'master'

2016-03-01 14:02:43 +00:00

mailers

Fix broken link in CI build notification emails

2016-02-12 14:01:27 +01:00

models

Reset otp_grace_period_started_at after disabling 2FA

2016-02-29 13:56:40 -05:00

services

Merge branch 'repository-caching-refactor' into 'master'

2016-02-26 22:07:50 +00:00

uploaders

Minor changes on avatar cropping internals

2016-02-18 13:12:39 +01:00

validators

Allow webhooks URL to have leading and trailing spaces

2016-02-26 14:34:06 -05:00

views

Changed page title

2016-03-01 13:15:09 +00:00

workers

Moved cache expiration code to Repository hooks

2016-02-23 12:02:59 +01:00