From c3406465dad4b12435b73e55ccbe0649c60fd525 Mon Sep 17 00:00:00 2001
From: Allen Gilliland <agilliland@gmail.com>
Date: Wed, 11 Nov 2015 09:04:38 -0800
Subject: [PATCH] create an `admin-email` setting and make it available on our
 General settings section.

---
 frontend/src/admin/settings/settings.controllers.js | 5 +++--
 src/metabase/core.clj                               | 2 ++
 2 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/frontend/src/admin/settings/settings.controllers.js b/frontend/src/admin/settings/settings.controllers.js
index 362a90f890b..0fbdff867d7 100644
--- a/frontend/src/admin/settings/settings.controllers.js
+++ b/frontend/src/admin/settings/settings.controllers.js
@@ -25,8 +25,9 @@ var TIMEZONES = [
 var EXTRA_SETTINGS_METADATA = {
     "site-name":            { display_name: "Site Name",          section: "General", index: 0, type: "string" },
     "-site-url":            { display_name: "Site URL",           section: "General", index: 1, type: "string" },
-    "report-timezone":      { display_name: "Report Timezone",    section: "General", index: 2, type: "select", options: TIMEZONES, placeholder: "Select a timezone" },
-    "anon-tracking-enabled":{ display_name: "Anonymous Tracking", section: "General", index: 3, type: "boolean" },
+    "admin-email":          { display_name: "Admin Email",        section: "General", index: 2, type: "string" },
+    "report-timezone":      { display_name: "Report Timezone",    section: "General", index: 3, type: "select", options: TIMEZONES, placeholder: "Select a timezone" },
+    "anon-tracking-enabled":{ display_name: "Anonymous Tracking", section: "General", index: 4, type: "boolean" },
     "email-smtp-host":      { display_name: "SMTP Host",          section: "Email",   index: 0, type: "string" },
     "email-smtp-port":      { display_name: "SMTP Port",          section: "Email",   index: 1, type: "string" },
     "email-smtp-security":  { display_name: "SMTP Security",      section: "Email",   index: 2, type: "radio", options: { none: "None", tls: "TLS", ssl: "SSL" } },
diff --git a/src/metabase/core.clj b/src/metabase/core.clj
index 3830201f90c..b95950bf353 100644
--- a/src/metabase/core.clj
+++ b/src/metabase/core.clj
@@ -32,6 +32,8 @@
 
 (defsetting -site-url "The base URL of this Metabase instance, e.g. \"http://metabase.my-company.com\"")
 
+(defsetting admin-email "The email address of the administrator for this Metabase.")
+
 (defsetting anon-tracking-enabled "Enable the collection of anonymous usage data in order to help Metabase improve." "true")
 
 (defn site-url
-- 
GitLab