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

luci-app-adblock: sync with adblock 3.5.0 #1614

Merged
merged 1 commit into from Jan 31, 2018

Conversation

Projects
None yet
3 participants
@dibdot
Copy link
Contributor

dibdot commented Jan 31, 2018

  • Support new 'Download Queue'
  • Support new 'Jail' Blocklist Creation
    (replace former 'Whitelist Mode')
  • Fix field width in "Runtime Information" section

Signed-off-by: Dirk Brenken dev@brenken.org

luci-app-adblock: sync with adblock 3.5.0
* Support new 'Download Queue'
* Support new 'Jail' Blocklist Creation
  (replace former 'Whitelist Mode')
* Fix field width in "Runtime Information" section

Signed-off-by: Dirk Brenken <dev@brenken.org>
@hnyman

This comment has been minimized.

Copy link
Contributor

hnyman commented Jan 31, 2018

no need for PRs any more. You can just push directly

@dibdot

This comment has been minimized.

Copy link
Contributor Author

dibdot commented Jan 31, 2018

Ah, OK forgot the new role ... ;-) Should I merge my own PRs for this time?

@hnyman

This comment has been minimized.

Copy link
Contributor

hnyman commented Jan 31, 2018

Yes.
And in future, you can just push the commits related to your own packages to the upstream master branch (once you are ready), if you want.

My own workflow for packages that I maintain:

  • I first commit locally in a feature branch of my fork,
  • then I push to my fork's master (origin/master) or to fork's feature branch, and verify/look at the commit output via Github GUI
    • do possible corrections locally, if e.g. some commit message looks funny in Github
    • possibly force push the my fork to update the commit
  • finally push to remote upstream/master (where you can't force-push)

You can of course keep doing PRs, as a PR also provides the preview possibility. Others could also then comment the proposed changes. But to be honest, I do not believe anybody to really look at your commits at that phase (as your own packages are fully self-authored by you). If no comments to the PR for a few hours, just merge it by yourself.

@thess

This comment has been minimized.

Copy link
Member

thess commented Jan 31, 2018

Yup - However, nothing wrong with PR if you are looking for comments/review. Either way, it's your choice now.

@dibdot

This comment has been minimized.

Copy link
Contributor Author

dibdot commented Jan 31, 2018

@hnyman @thess
OK, understood - many thanks!

@dibdot dibdot merged commit 518ac52 into openwrt:master Jan 31, 2018

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
You can’t perform that action at this time.