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

Plays and musicals #1485

Merged
merged 7 commits into from
May 17, 2020
Merged

Plays and musicals #1485

merged 7 commits into from
May 17, 2020

Conversation

armandofox
Copy link
Contributor

Added code, data, tests for Broadway plays and musicals, subdivided into play, adult_musical, kids_musical. Tests & rubocop all passing and rebased to master in upstream repo.

Copy link
Member

@vbrazo vbrazo left a comment

Choose a reason for hiding this comment

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

I left a comment. You also need to update our unreleased_README.md.

lib/faker/show.rb Outdated Show resolved Hide resolved
@armandofox
Copy link
Contributor Author

Wrapped show.rb in Faker::Music::Show, verified tests all good, updated unreleased_README.md and doc/unreleased/music/show.rb

@Zeragamba
Copy link
Contributor

Changes look good to me

@armandofox
Copy link
Contributor Author

Hi, is this getting merged anytime soon? @Zeragamba seems to have blessed it and I think I complied with all the change requests. Would like to get back to using master branch rather than my fork! Thanks

@armandofox
Copy link
Contributor Author

Hi, just checking the status of this again. After @Zeragamba signed off on the changes I didn't see any further activity assigned to me before this could be merged, but it still shows as open.

@Zeragamba
Copy link
Contributor

Zeragamba commented May 16, 2020

Looks like there are conflicts that need to be resolved first, and then we can merge this in after having the PR open for... A year. Ouch. Sorry about that

Copy link
Contributor

@Zeragamba Zeragamba left a comment

Choose a reason for hiding this comment

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

Two minor changes needed, and we're good to go :)

unreleased_README.md Show resolved Hide resolved
lib/faker/music/show.rb Outdated Show resolved Hide resolved
Co-authored-by: Stephen A. Wilson <stephen-356@hotmail.com>
@armandofox
Copy link
Contributor Author

armandofox commented May 17, 2020 via email

@Zeragamba Zeragamba merged commit 9140dce into faker-ruby:master May 17, 2020
@Zeragamba
Copy link
Contributor

Boom

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants