From 4d8b6355038c2608a5722aa41e0d60bd49c3fc16 Mon Sep 17 00:00:00 2001
From: Joram Wilander <jwawilander@gmail.com>
Date: Wed, 13 Apr 2016 14:32:00 -0400
Subject: Allow removing of license without turning off enterprise features
 (#2690)

---
 webapp/components/admin_console/license_settings.jsx | 6 +-----
 1 file changed, 1 insertion(+), 5 deletions(-)

(limited to 'webapp/components/admin_console')

diff --git a/webapp/components/admin_console/license_settings.jsx b/webapp/components/admin_console/license_settings.jsx
index ad310d8e0..30a97a73b 100644
--- a/webapp/components/admin_console/license_settings.jsx
+++ b/webapp/components/admin_console/license_settings.jsx
@@ -131,7 +131,6 @@ class LicenseSettings extends React.Component {
             licenseKey = (
                 <div className='col-sm-8'>
                     <button
-                        disabled={this.props.config.LdapSettings.Enable}
                         className='btn btn-danger'
                         onClick={this.handleRemove}
                         id='remove-button'
@@ -145,10 +144,7 @@ class LicenseSettings extends React.Component {
                     <br/>
                     <br/>
                     <p className='help-text'>
-                        <FormattedHTMLMessage
-                            id='admin.licence.keyMigration'
-                            defaultMessage='If you’re migrating servers you may need to remove your license key from this server in order to install it on a new server. To start, <a href="http://mattermost.com" target="_blank">disable all Enterprise Edition features on this server</a>. This will enable the ability to remove the license key and downgrade this server from Enterprise Edition to Team Edition.'
-                        />
+                        {'If you migrate servers you may need to remove your license key to install it elsewhere. You can remove the key here, which will revert functionality to that of Team Edition.'}
                     </p>
                 </div>
             );
-- 
cgit v1.2.3-1-g7c22