Main repo merge #1
Open
Conversation
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Travis update
Change twig dep to ^1.25 rather than ^1.24
Fixes schmittjoh#107 for twig 1.x
Conflicts: composer.lock
Conflicts: composer.lock
Libraries should not include a composer.lock file
Conflicts: composer.lock
Add composer flag: prefer-stable: true
|
@basekit/developers Not sure what everyone else thinks but there's no way we can technically review this ourselves. The truth of this working should really be handled by our test suite (especially the functional tests) |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Merged a mixture of the root repository for this repo and the forked repository of BigCommerce's repo into this one.
These changes upgrade a number of broken aspects that prevent our Twig Upgrade.