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 moment #1977

Merged
merged 2 commits into from
Jun 7, 2020
Merged

Fix moment #1977

merged 2 commits into from
Jun 7, 2020

Conversation

gitKrystan
Copy link
Contributor

@gitKrystan gitKrystan commented Jun 7, 2020 •
edited
Loading

Resolves the following errors on the floating dependencies tests (e.g. https://travis-ci.org/github/miragejs/ember-cli-mirage/jobs/692761519):

Merge error: conflicting capitalizations:
vendor/moment/locale/en-SG.js in /home/travis/build/miragejs/ember-cli-mirage/tmp/broccoli_merge_trees-input_base_path-COwZk18H.tmp/1
vendor/moment/locale/en-sg.js in /home/travis/build/miragejs/ember-cli-mirage/tmp/broccoli_merge_trees-input_base_path-COwZk18H.tmp/1
Remove one of the files and re-add it with matching capitalization.

See jasonmit/ember-cli-moment-shim#183

@gitKrystan
Upgrade ember-cli-moment-shim
41b7a07 
`ember-moment` recommends running `ember g ember-moment` after upgrades,
which just upgrades ember-cli-moment-shim to a compatible version.
@gitKrystan
Upgrade moment.js
281b80d
@gitKrystan gitKrystan mentioned this pull request Jun 7, 2020
Merged
@samselikoff samselikoff merged commit 4aecc92 into miragejs:master Jun 7, 2020
@samselikoff
Copy link
Collaborator

Thank you!

@chancancode chancancode mentioned this pull request Jun 9, 2020
Merged
@gitKrystan gitKrystan deleted the fix-moment branch June 14, 2020 17:04
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@chancancode chancancode chancancode approved these changes

Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
3 participants
@gitKrystan @samselikoff @chancancode