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

Add missing merge labels for jekyllbot #5753

Merged
merged 2 commits into from Jan 18, 2017

Conversation

Projects
None yet
4 participants
@DirtyF
Member

DirtyF commented Jan 11, 2017

Show outdated Hide outdated docs/_docs/maintaining/merging-a-pull-request.md
@@ -38,8 +38,9 @@ The categories match the H3's in the history/changelog file, and they are:
1. Major Enhancements (`+major`) – major updates or breaking changes to the code which necessitate a major version bump (v3 ~> v4)
2. Minor Enhancements (`+minor`) – minor updates (feature, enhancement) which necessitate a minor version bump (v3.1 ~> v3.2)
3. Bug Fixes (`+bug`) – corrections to code which do not change or add functionality, which necessitate a patch version bump (v3.1.0 ~> v3.1.1)
4. Site Enhancements (`+site`) – changes to the source of https://jekyllrb.com, found in `site/`
4. Site Enhancements (`+site` or `+doc`) – changes to the source or the documentation found in `docs/` and published on https://jekyllrb.com,

This comment has been minimized.

This comment has been minimized.

@DirtyF

DirtyF Jan 11, 2017

Member

yup

@DirtyF
Show outdated Hide outdated docs/_docs/maintaining/merging-a-pull-request.md
5. Development Fixes (`+dev`) – changes which do not affect user-facing functionality or documentation, such as test fixes or bumping internal dependencies
6. Forward Ports (`+port`) — forward-port changes, e.g. from v3.1.4.

This comment has been minimized.

@parkr

parkr Jan 11, 2017

Member

"forward-port changes" doesn't really describe this well if you don't know what forward-porting is supposed to mean. How about:

Forward Ports (+port) – bug fixes applied to a previous version of Jekyll pulled onto master, e.g. cherry-picked commits from 3-1-stable to master

?

@parkr

parkr Jan 11, 2017

Member

"forward-port changes" doesn't really describe this well if you don't know what forward-porting is supposed to mean. How about:

Forward Ports (+port) – bug fixes applied to a previous version of Jekyll pulled onto master, e.g. cherry-picked commits from 3-1-stable to master

?

@parkr

parkr approved these changes Jan 18, 2017

@parkr

This comment has been minimized.

Show comment
Hide comment
@parkr

parkr Jan 18, 2017

Member

@jekyllbot: merge +doc

Member

parkr commented Jan 18, 2017

@jekyllbot: merge +doc

@jekyllbot jekyllbot merged commit 20c6aec into jekyll:master Jan 18, 2017

2 checks passed

continuous-integration/appveyor/pr AppVeyor build succeeded
Details
continuous-integration/travis-ci/pr The Travis CI build passed
Details

jekyllbot added a commit that referenced this pull request Jan 18, 2017

@DirtyF DirtyF deleted the DirtyF:docs-merge-categories branch Jan 18, 2017

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