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

update bramble to 0.1.15, change default html and project level files #15050

Merged
merged 5 commits into from May 15, 2017

Conversation

cpirich
Copy link
Contributor

@cpirich cpirich commented May 12, 2017

@cpirich cpirich requested a review from islemaster May 12, 2017 17:48
Copy link
Contributor

@islemaster islemaster left a comment

Choose a reason for hiding this comment

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

Update seems great, but it looks like your generated yarn.lock does not line up with the one being generated in CI.

bundle exec rake circle:check_for_unexpected_apps_changes
rake aborted!
Unexpected change to apps/yarn.lock; if you changed package.json you should also have committed an updated yarn.lock file.

To fix, start with removing node_modules and running yarn locally again, and see if you get changes in yarn.lock. You may also want to double-check that you're using yarn 0.23.2 (the version we're currently locked to) as different versions can generate different lockfiles.

Copy link
Contributor

@islemaster islemaster left a comment

Choose a reason for hiding this comment

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

LGTM if we can get Circle to pass 👍

@cpirich cpirich merged commit f3cdf53 into staging May 15, 2017
@cpirich cpirich deleted the weblab_update_bramble_and_default_content branch May 15, 2017 22:50
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

2 participants