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

Add settings option to menu and use Ruby 2.1.10 in Travis #1899

Merged
merged 3 commits into from
Oct 29, 2017
Merged

Add settings option to menu and use Ruby 2.1.10 in Travis #1899

merged 3 commits into from
Oct 29, 2017

Conversation

stevenzeck
Copy link
Contributor

What does this implement/fix? Explain your changes.

This adds an option to the Packages -> Atom Beautify submenu, Settings, that goes directly to the settings page for Atom Beautify. This is also available in the command palette.

During the initial Travis build, Rubocop could not be installed on the OSX build because it requires Ruby 2.1 or greater. The default is 2.0.0, thus a second change was added to use Ruby 2.1.10 so that the Travis build would pass (although it didn't fully, more on that below).
...

Does this close any currently open issues?

#1869
...

Any other comments?

The OSX Travis build will still fail. I'm getting the same errors with puppet-lint and sass as the master branch here. I'm still working with Travis support to try and resolve them, but the builds will continue to fail for now. Since it doesn't fail until the very end, and the Linux builds are fine, it should be safe to merge IMO.
...

Checklist

Check all those that are applicable and complete.

  • Merged with latest master branch
  • Regenerate documentation with npm run docs
  • Add change details to CHANGELOG.md under "Next" section
  • Added examples for testing to examples/ directory
  • Travis CI passes (Mac support)
  • AppVeyor passes (Windows support)

@stevenzeck stevenzeck self-assigned this Oct 20, 2017
@stevenzeck stevenzeck requested a review from Glavin001 October 20, 2017 16:29
@stevenzeck
Copy link
Contributor Author

@Glavin001 it looks like the Ruby unit tests are skipped, does Rubocop need to be installed in the Travis build? If not, I'd rather comment it out and leave the Ruby version as is.

Copy link
Owner

@Glavin001 Glavin001 left a comment

Choose a reason for hiding this comment

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

@szeck87 , agreed. Comment out the Ruby change and let's merge.

Thanks for contributing!

@Glavin001 Glavin001 merged commit 218a804 into Glavin001:master Oct 29, 2017
@Glavin001
Copy link
Owner

Thanks for contributing!

@stevenzeck stevenzeck deleted the add-settings-menu branch October 29, 2017 22:30
@Glavin001 Glavin001 added this to the v0.35.6 milestone Oct 30, 2017
@Glavin001
Copy link
Owner

Published to v0.30.6

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants