Merge pull request #2079 from mattermost/help-text-updates

Changing URL for testing push notifications

web/react/components/admin_console/email_settings.jsx

@@ -54,7 +54,7 @@ var holders = defineMessages({
     },
     pushServerEx: {
         id: 'admin.email.pushServerEx',
-        defaultMessage: 'E.g.: "https://push-test.mattermost.com"'
+        defaultMessage: 'E.g.: "http://push-test.mattermost.com"'
     },
     testing: {
         id: 'admin.email.testing',
@@ -918,7 +918,7 @@ class EmailSettings extends React.Component {
                             <p className='help-text'>
                                 <FormattedMessage
                                     id='admin.email.pushServerDesc'
-                                    defaultMessage='Location of Mattermost push notification service you can set up behind your firewall using https://github.com/mattermost/push-proxy. For testing you can use https://push-test.mattermost.com, which connects to the sample Mattermost iOS app in the public Apple AppStore. Please do not use test service for production deployments.'
+                                    defaultMessage='Location of Mattermost push notification service you can set up behind your firewall using https://github.com/mattermost/push-proxy. For testing you can use http://push-test.mattermost.com, which connects to the sample Mattermost iOS app in the public Apple AppStore. Please do not use test service for production deployments.'
                                 />
                             </p>
                         </div>
@@ -954,4 +954,4 @@ EmailSettings.propTypes = {
     config: React.PropTypes.object
 };
 
-export default injectIntl(EmailSettings);
+export default injectIntl(EmailSettings);