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

Merging ponzu-dev to master as v0.11.0 #311

Merged
merged 14 commits into from Aug 1, 2019

Conversation

@olliephillips
Copy link
Member

commented Jul 18, 2019

Re issue #302 this feature allows Ponzu responses to be "acted on" before they are served over the API.

Ollie Phillips and others added some commits Mar 25, 2019

Merge pull request #301 from olliephillips/ponzu-dev
adds physical file deletion, when deleting an uploaded file from Ponzu
Ollie Phillips
Merge pull request #305 from olliephillips/ponzu-dev
Tentatively merging this @nilslice. The code and markdown docs are complete I think.  As I understand it, you'll need to merge it to master. I can't do that - and a good thing too ;) I'll do the same on the main docs repo also
@nilslice

This comment has been minimized.

Copy link
Member

commented on 75d316c May 9, 2019

@olliephillips - looks great -- thank you! I thought I had enabled master merges for you, but will take a look. Fully intended that you would be able to.

This comment has been minimized.

Copy link
Member

replied May 11, 2019

Maybe I misunderstood, I thought you said only admin could merge their own PRs, and that was currently just you? Honestly, I'd prefer it if you did have the last say on merge to master. There are build steps for the documentation and there are releases to consider - what merits a release? I'm totally onboard as a Ponzu team member and will continue contributing, I just don't want to cock up things :)

Ollie Phillips
@olliephillips

This comment has been minimized.

Copy link
Member Author

commented Jul 31, 2019

How do we look here @nilslice @ponzu-cms/team?

@nilslice
Copy link
Member

left a comment

Looks good to me -- thanks @olliephillips

@olliephillips olliephillips merged commit f0472b9 into master Aug 1, 2019

1 check passed

ci/circleci Your tests passed on CircleCI!
Details
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
2 participants
You can’t perform that action at this time.