From cdb46bab03416bdad973396cab8b3cd0dd897667 Mon Sep 17 00:00:00 2001
From: Ben Bodenmiller <bbodenmiller@hotmail.com>
Date: Thu, 20 Aug 2015 19:05:37 -0700
Subject: [PATCH 1/2] add notification_email

---
 lib/api/entities.rb | 1 +
 1 file changed, 1 insertion(+)

diff --git a/lib/api/entities.rb b/lib/api/entities.rb
index 1f9dd6bc152..21deab8612c 100644
--- a/lib/api/entities.rb
+++ b/lib/api/entities.rb
@@ -24,6 +24,7 @@ module API
 
     class UserFull < User
       expose :email
+      expose :notification_email
       expose :theme_id, :color_scheme_id, :projects_limit, :current_sign_in_at
       expose :identities, using: Entities::Identity
       expose :can_create_group?, as: :can_create_group
-- 
GitLab


From 2d8c5a7f572cef984ef453c170dd051b84d1c781 Mon Sep 17 00:00:00 2001
From: Ben Bodenmiller <bbodenmiller@hotmail.com>
Date: Thu, 20 Aug 2015 19:07:10 -0700
Subject: [PATCH 2/2] Update CHANGELOG

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

diff --git a/CHANGELOG b/CHANGELOG
index 54f83e5aeac..fe362efffd7 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -7,6 +7,7 @@ v 8.0.0 (unreleased)
   - Ability to fetch merge requests from refs/merge-requests/:id
   - Allow displaying of archived projects in the admin interface (Artem Sidorenko)
   - Allow configuration of import sources for new projects (Artem Sidorenko)
+  - Add `notification_email` field to admin user API (Ben Bodenmiller)
 
 v 7.14.0 (unreleased)
   - Update default robots.txt rules to disallow crawling of irrelevant pages (Ben Bodenmiller)
-- 
GitLab