From d2945cdd77bdf1ee03367a0d45624094fb936c19 Mon Sep 17 00:00:00 2001
From: George Goldberg <george@gberg.me>
Date: Wed, 22 Aug 2018 20:12:51 +0100
Subject: MM-11782: Make archived channels experimental and off-by-default.
 (#9281)

* MM-11782: Make archived channels experimental and off-by-default.

* Fix test.
---
 model/config.go | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

(limited to 'model')

diff --git a/model/config.go b/model/config.go
index e38c993a8..a7044d9e1 100644
--- a/model/config.go
+++ b/model/config.go
@@ -1125,7 +1125,7 @@ type TeamSettings struct {
 	MaxNotificationsPerChannel          *int64
 	EnableConfirmNotificationsToChannel *bool
 	TeammateNameDisplay                 *string
-	ViewArchivedChannels                *bool
+	ExperimentalViewArchivedChannels    *bool
 	ExperimentalEnableAutomaticReplies  *bool
 	ExperimentalHideTownSquareinLHS     *bool
 	ExperimentalTownSquareIsReadOnly    *bool
@@ -1255,8 +1255,8 @@ func (s *TeamSettings) SetDefaults() {
 		s.EnableUserCreation = NewBool(true)
 	}
 
-	if s.ViewArchivedChannels == nil {
-		s.ViewArchivedChannels = NewBool(true)
+	if s.ExperimentalViewArchivedChannels == nil {
+		s.ExperimentalViewArchivedChannels = NewBool(false)
 	}
 }
 
-- 
cgit v1.2.3-1-g7c22