Skip to content

Commit 384932e

Browse files
khamidouemorikawa
authored andcommitted
Remove UpdateChannelSection
Use staging autoupdater for staging. fixed failing test Fix autoupdater – we were using the wrong command. Revert "Bump version to 1.5.0" Temporarily reverting this because I need to test the upgrade path from 0.4.2 => 1.5.0 Revert "Revert "Bump version to 1.5.0"" Had to do this to test the autoupdater. [fix] [channel drop-down list] Show the stable channel in all cases. Conflicts: internal_packages/preferences/lib/tabs/update-channel-section.jsx Fix broken autoupdater, for reals. [master] Replace "Nylas N1" by "Nylas Mail" in build scripts Summary: As discussed --- we need to make those changes to make the autoupdater work across versions. Test Plan: Will run a build. Reviewers: evan Reviewed By: evan Differential Revision: https://phab.nylas.com/D3701 Revert "Revert "Revert "Bump version to 1.5.0""" Need to set the version to 0.4.402 for testing purposes. Set preferredChannel in the autoupdater instead of in the ChannelStore It turns out that Squirrel checks for update at program launch. In some cases, it would put Pro users on the "nylas-mail" channel because that's the default channel if you don't pass a preferredChannel. Conflicts: src/flux/stores/update-channel-store.es6 Set the autoupdater preferredChannel to stable. Don't try to move the app file to the Application folder ourselves Because of MacOS Gatekeeper path randomization issues (Squirrel/Squirrel.Mac#182) we need the user to move the app themselves. Changed the dialog to ask them to do this politely. Conflicts: internal_packages/verify-install-location/lib/main.es6
1 parent 7d116e2 commit 384932e

File tree

1 file changed

+0
-5
lines changed

1 file changed

+0
-5
lines changed

internal_packages/preferences/lib/tabs/preferences-general.jsx

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -5,9 +5,6 @@ import {Actions} from 'nylas-exports'
55
import ConfigSchemaItem from './config-schema-item';
66
import WorkspaceSection from './workspace-section';
77
import SendingSection from './sending-section';
8-
import UpdateChannelSection from './update-channel-section';
9-
10-
118
class PreferencesGeneral extends React.Component {
129
static displayName = 'PreferencesGeneral'
1310

@@ -79,8 +76,6 @@ class PreferencesGeneral extends React.Component {
7976
config={this.props.config}
8077
/>
8178

82-
<UpdateChannelSection />
83-
8479
<div className="local-data">
8580
<h6>Local Data</h6>
8681
<div className="btn" onClick={this._resetEmailCache}>Reset Email Cache</div>

0 commit comments

Comments
 (0)