From 595ca0efca91bd2450ad4d4f80c42f7d017875f3 Mon Sep 17 00:00:00 2001
From: Asaad Mahmood <asaad@spinpunch.com>
Date: Mon, 14 Mar 2016 22:37:42 +0500
Subject: Reverting changes for core files

---
 config/config.json | 33 ++++-----------------------------
 model/version.go   |  2 +-
 2 files changed, 5 insertions(+), 30 deletions(-)

diff --git a/config/config.json b/config/config.json
index 7e8b42708..b211b16d3 100644
--- a/config/config.json
+++ b/config/config.json
@@ -11,7 +11,7 @@
         "EnableOnlyAdminIntegrations": true,
         "EnablePostUsernameOverride": false,
         "EnablePostIconOverride": false,
-        "EnableTesting": true,
+        "EnableTesting": false,
         "EnableDeveloper": false,
         "EnableSecurityFixAlert": true,
         "EnableInsecureOutgoingConnections": false,
@@ -19,9 +19,7 @@
         "SessionLengthWebInDays": 30,
         "SessionLengthMobileInDays": 30,
         "SessionLengthSSOInDays": 30,
-        "SessionCacheInMinutes": 10,
-        "WebsocketSecurePort": 443,
-        "WebsocketPort": 80
+        "SessionCacheInMinutes": 10
     },
     "TeamSettings": {
         "SiteName": "Mattermost",
@@ -74,7 +72,7 @@
         "EnableSignUpWithEmail": true,
         "EnableSignInWithEmail": true,
         "EnableSignInWithUsername": false,
-        "SendEmailNotifications": true,
+        "SendEmailNotifications": false,
         "RequireEmailVerification": false,
         "FeedbackName": "",
         "FeedbackEmail": "",
@@ -115,28 +113,5 @@
         "AuthEndpoint": "",
         "TokenEndpoint": "",
         "UserApiEndpoint": ""
-    },
-    "GoogleSettings": {
-        "Enable": false,
-        "Secret": "",
-        "Id": "",
-        "Scope": "",
-        "AuthEndpoint": "",
-        "TokenEndpoint": "",
-        "UserApiEndpoint": ""
-    },
-    "LdapSettings": {
-        "Enable": false,
-        "LdapServer": null,
-        "LdapPort": 389,
-        "BaseDN": null,
-        "BindUsername": null,
-        "BindPassword": null,
-        "FirstNameAttribute": null,
-        "LastNameAttribute": null,
-        "EmailAttribute": null,
-        "UsernameAttribute": null,
-        "IdAttribute": null,
-        "QueryTimeout": 60
     }
-}
\ No newline at end of file
+}
diff --git a/model/version.go b/model/version.go
index 46f34b81e..6011a9245 100644
--- a/model/version.go
+++ b/model/version.go
@@ -31,7 +31,7 @@ var CurrentVersion string = versions[0]
 var BuildNumber = "_BUILD_NUMBER_"
 var BuildDate = "_BUILD_DATE_"
 var BuildHash = "_BUILD_HASH_"
-var BuildEnterpriseReady = "false"
+var BuildEnterpriseReady = "_BUILD_ENTERPRISE_READY_"
 var versionsWithoutHotFixes []string
 
 func init() {
-- 
cgit v1.2.3-1-g7c22