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

Replace Ember.String.{pluralize,singularize} with ember-inflector imports #5130

Merged
merged 1 commit into from
Aug 16, 2017
Merged

Replace Ember.String.{pluralize,singularize} with ember-inflector imports #5130

merged 1 commit into from
Aug 16, 2017

Conversation

locks
Copy link
Contributor

@locks locks commented Aug 16, 2017

No description provided.

rwjblue
rwjblue approved these changes Aug 16, 2017
View reviewed changes
Copy link
Member

@rwjblue rwjblue left a comment

Choose a reason for hiding this comment

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

LGTM, but is blocked by #5123 for the moment.

@stefanpenner
Copy link
Member

we just fixed our tests, @locks mind rebasing? That way we know this actually works against all supported versions of ember.

@locks locks force-pushed the fix-pluralize-singularize branch from 1ffd6a4 to bc930ff Compare August 16, 2017 18:39
@locks
Copy link
Contributor Author

locks commented Aug 16, 2017

🏓

@rwjblue rwjblue merged commit ef9f707 into master Aug 16, 2017
@rwjblue rwjblue deleted the fix-pluralize-singularize branch August 16, 2017 19:13
@Turbo87
Copy link
Member

Turbo87 commented Aug 22, 2017

@rwjblue @stefanpenner can we backport this to beta to unblock emberjs/ember-inflector#131?

@Turbo87
Copy link
Member

Turbo87 commented Aug 22, 2017 •
edited
Loading

@locks I think you missed

data/tests/integration/serializers/rest-serializer-test.js

Line 78 in ef9f707

Ember.Inflector.inflector.uncountable('words');

@locks
Copy link
Contributor Author

locks commented Aug 22, 2017

@Turbo87 thank you #5141

@Turbo87 Turbo87 mentioned this pull request Aug 25, 2017
Merged
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@rwjblue rwjblue rwjblue 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.
4 participants
@locks @stefanpenner @Turbo87 @rwjblue