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.

Sign up for GitHub

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

Jump to bottom

fix: fix Bower file invalid JSON #11364 #11367

Merged
merged 1 commit into from
Jul 2, 2018
Merged

fix: fix Bower file invalid JSON #11364 #11367

merged 1 commit into from
Jul 2, 2018

Conversation

ncoden
Copy link
Contributor

@ncoden ncoden commented Jul 1, 2018

Description

Remove a leading , making the Bower json file invalid.

Bug was introduced in #11350
Closes #11364

Types of changes

  • Documentation
  • Bug fix (non-breaking change which fixes an issue)
  • New feature (non-breaking change which adds functionality)
  • Breaking change (fix or feature that would cause existing
    functionality to change)

Checklist (all required):

  • I have read and follow the CONTRIBUTING document.
  • There are no other pull request similar to this one.
  • The pull request title is descriptive.
  • The template is fully and correctly filled.
  • The pull request targets the right branch (develop or support/*).
  • My commits are correctly titled and contain all relevant information.
  • My code follows the code style of this project.
  • I have updated the documentation accordingly to my changes (if relevant).
  • I have added tests to cover my changes (if relevant).
  • All new and existing tests passed.

@ncoden ncoden added the bug fix label Jul 1, 2018
@ncoden ncoden requested a review from DanielRuf July 1, 2018 20:16
@ncoden ncoden mentioned this pull request Jul 1, 2018
Closed
@DanielRuf
Copy link
Contributor

Already done in the 6.5 branch afaik. develop and 6.5 are not in sync.

@ncoden
Copy link
Contributor Author

ncoden commented Jul 1, 2018 •
edited
Loading

@DanielRuf The bug was introduced in #11350 which is not yet used in v6.5. It will with the RC2 release, like the current PR.

develop and support/6.5 indeed diverged as there is changes in develop we do not want in support/6.5. All fixes we want to have in both v6.5.x (support/6.5) and v6.6.x (develop) have to be duplicated. This is what Use pull request xxx from xxx for v6.5 commits are doing in v6.5 release pull requests (like #11340) are doing.

@ncoden ncoden merged commit d1a5962 into foundation:develop Jul 2, 2018
@ncoden ncoden added this to the 6.5.0 milestone Jul 6, 2018
ncoden added a commit to ncoden/foundation-sites that referenced this pull request Jul 6, 2018
@ncoden
Use pull request foundation#11367 from ncoden/fix/fix-bower-json-1136…
f33d808 
…4 for v6.5.0

a43e20b fix: fix Bower file invalid JSON foundation#11364

Signed-off-by: Nicolas Coden <[email protected]>
ncoden added a commit to ncoden/foundation-sites that referenced this pull request Jul 8, 2018
@ncoden
Use pull request foundation#11367 from ncoden/fix/fix-bower-json-1136…
162b00e 
…4 for v6.5.0

a43e20b fix: fix Bower file invalid JSON foundation#11364

Signed-off-by: Nicolas Coden <[email protected]>
@ncoden ncoden mentioned this pull request Jul 8, 2018
Merged
10 tasks
This was referenced Apr 22, 2020
Open
Open
Merged
Open
Merged
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@DanielRuf DanielRuf DanielRuf approved these changes

Assignees
No one assigned
Labels
bug fix
Projects
None yet
Milestone
6.5.0
Development

Successfully merging this pull request may close these issues.

bower.json is not valid JSON
2 participants
@ncoden @DanielRuf