Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Ensure correct update channel is displayed in About window #2130

Merged
merged 1 commit into from
Aug 30, 2017

Conversation

leo
Copy link
Contributor

@leo leo commented Aug 30, 2017

No description provided.

@leo leo added 🐧 Platform: Linux Issue pertains to Linux 🍎 Platform: Mac Issue pertains to Mac 🖼 Platform: Windows Issue pertains to Windows ❣️ Priority: High Issue is of High priority labels Aug 30, 2017
@leo leo requested a review from chabou August 30, 2017 17:01
Copy link
Contributor

@albinekb albinekb left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

👍

@@ -19,7 +19,11 @@ module.exports = (createWindow, updatePlugins, getLoadedPluginVersions) => {
const config = getConfig();
const {commands} = getKeymaps();

const updateChannel = config.canaryUpdates ? 'canary' : 'stable';
let updateChannel = 'stable';
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I think this logic should live inside the config, so that it's populated correctly whereever we need this? But OK for now

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

We have different logics in those two places at the moment, but yep - definitely! 👍

@leo leo merged commit 356f93f into master Aug 30, 2017
@leo leo deleted the about-update-channel branch August 30, 2017 17:14
chabou added a commit that referenced this pull request Sep 3, 2017
* master: (62 commits)
  1.4.3
  Disable ia32 linux releases (#2164)
  Fixed writing composed characters (#2158)
  Doc: Add yarn install to contribute instructions (#2117)
  Change "Close Session" shortcut on Linux/Windows  (#2160)
  Notice for plugins (#2114)
  Updated dependencies to the latest version (#2146)
  1.4.2
  Reverted class names to as they were before (#2139)
  1.4.1
  AppVeyor environment variables are now on the platform (#2137)
  Brought back the icon for closing tabs (#2136)
  Brought back keymap documentation to the website (#2133)
  1.4.0
  Don't build on master, except for releases (#2132)
  Ensured that `async-retry` is added to the bundle (#2131)
  Ensure correct update channel is displayed in About window (#2130)
  Retry loading it if config doesn't exist in auto updater (#2129)
  Write contents of default config to hyper.js (#2128)
  Use a string for setting the update channel (#2127)
  ...
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
🐧 Platform: Linux Issue pertains to Linux 🍎 Platform: Mac Issue pertains to Mac 🖼 Platform: Windows Issue pertains to Windows ❣️ Priority: High Issue is of High priority
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants