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 mozjs and enable 'init_once' feature for Android #22200

Merged
merged 1 commit into from Nov 19, 2018

Conversation

@paulrouget
Copy link
Contributor

paulrouget commented Nov 15, 2018

Fix #22039

This change is Reviewable

@highfive
Copy link

highfive commented Nov 15, 2018

Heads up! This PR modifies the following files:

@highfive
Copy link

highfive commented Nov 15, 2018

warning Warning warning

  • These commits modify script code, but no tests are modified. Please consider adding a test!
@jdm
jdm approved these changes Nov 15, 2018
@jdm
Copy link
Member

jdm commented Nov 15, 2018

@bors-servo
Copy link
Contributor

bors-servo commented Nov 15, 2018

📌 Commit e0108f7 has been approved by jdm

@highfive highfive assigned jdm and unassigned asajeffrey Nov 15, 2018
@bors-servo
Copy link
Contributor

bors-servo commented Nov 15, 2018

The latest upstream changes (presumably #22149) made this pull request unmergeable. Please resolve the merge conflicts.

@bors-servo
Copy link
Contributor

bors-servo commented Nov 16, 2018

🔒 Merge conflict

@paulrouget paulrouget force-pushed the paulrouget:mozjsup branch from e0108f7 to d27cfb3 Nov 19, 2018
@paulrouget
Copy link
Contributor Author

paulrouget commented Nov 19, 2018

@bors-servo r=jdm

@bors-servo
Copy link
Contributor

bors-servo commented Nov 19, 2018

📌 Commit d27cfb3 has been approved by jdm

@bors-servo
Copy link
Contributor

bors-servo commented Nov 19, 2018

Testing commit d27cfb3 with merge 1ac6f43...

bors-servo added a commit that referenced this pull request Nov 19, 2018
Update mozjs and enable 'init_once' feature for Android

Fix #22039

<!-- Reviewable:start -->
This change is [<img src="https://reviewable.io/review_button.svg" height="34" align="absmiddle" alt="Reviewable"/>](https://reviewable.io/reviews/servo/servo/22200)
<!-- Reviewable:end -->
@bors-servo bors-servo merged commit d27cfb3 into servo:master Nov 19, 2018
3 checks passed
3 checks passed
continuous-integration/appveyor/pr AppVeyor build succeeded
Details
continuous-integration/travis-ci/pr The Travis CI build passed
Details
homu Test successful
Details
@bors-servo bors-servo mentioned this pull request Nov 19, 2018
moz-v2v-gh pushed a commit to mozilla/gecko-dev that referenced this pull request Dec 3, 2018
moz-v2v-gh pushed a commit to mozilla/gecko-dev that referenced this pull request Dec 3, 2018
mykmelez pushed a commit to mykmelez/gecko that referenced this pull request Dec 4, 2018
mykmelez pushed a commit to mykmelez/gecko that referenced this pull request Dec 4, 2018
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Linked issues

Successfully merging this pull request may close these issues.

None yet

5 participants
You can’t perform that action at this time.