From db8f4c06060d002c63b20ff51871976aaf9c9d4c Mon Sep 17 00:00:00 2001
From: Robert Speicher <rspeicher@gmail.com>
Date: Fri, 10 Jul 2015 17:11:39 -0400
Subject: Add a button to Admin::Users#show to disable 2FA for that user

---
 CHANGELOG | 1 +
 1 file changed, 1 insertion(+)

(limited to 'CHANGELOG')

diff --git a/CHANGELOG b/CHANGELOG
index a964a192216..a63d90a8f91 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -43,6 +43,7 @@ v 7.13.0 (unreleased)
   - Redesign project page. Show README as default instead of activity. Move project activity to separate page
   - Make left menu more hierarchical and less contextual by adding back item at top
   - A fork can’t have a visibility level that is greater than the original project.
+  - Allow administrators to disable 2FA for a specific user
 
 v 7.12.2
   - Correctly show anonymous authorized applications under Profile > Applications.
-- 
cgit v1.2.3