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

Fixed conversion of the word "status" to singular #143

Merged
merged 1 commit into from
May 9, 2020

Conversation

andrey-helldar
Copy link
Contributor

Now the conversion of the word "status" is as follows:

  • status => statu

Adding a new rule fixes this error.

Copy link
Member

@greg0ire greg0ire left a comment

Choose a reason for hiding this comment

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

@GrahamCampbell
Copy link
Contributor

Is this bug present in 1.4.x?

@GrahamCampbell
Copy link
Contributor

It looks like it is. This PR should be sent to the 1.4 branch.

@GrahamCampbell
Copy link
Contributor

(also, note that the master branch here is for version 2.1, not 2.0)

@greg0ire
Copy link
Member

greg0ire commented May 9, 2020

Please squash your commits together

@andrey-helldar
Copy link
Contributor Author

Please squash your commits together

Done :)

@greg0ire greg0ire changed the base branch from master to 1.4.x May 9, 2020 10:59
@greg0ire
Copy link
Member

greg0ire commented May 9, 2020

Please git rebase --onto 1.4.x master patch-2020-05-09-11-57 && git push --force

@andrey-helldar
Copy link
Contributor Author

Pushed

@andrey-helldar
Copy link
Contributor Author

@greg0ire, will this fix be applied in version 2.x?

@greg0ire
Copy link
Member

greg0ire commented May 9, 2020

Yes, with a merge up. We use a merge up workflow now.

@greg0ire greg0ire merged commit 533233f into doctrine:1.4.x May 9, 2020
@andrey-helldar
Copy link
Contributor Author

@greg0ire, thanks! Just decided to clarify 😊

@alcaeus alcaeus added this to the 1.4.1 milestone May 11, 2020
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

4 participants