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

Allow colons in `uri_escape` filter Fixes #5954 #5957

Merged
merged 2 commits into from Mar 21, 2017

Conversation

Projects
None yet
5 participants
@jekyllbot
Contributor

jekyllbot commented Mar 16, 2017

PR automatically created for @pathawks.

Allow colons in `uri_escape` filter

Fixes #5954
@pathawks

This comment has been minimized.

Show comment
Hide comment
@pathawks

pathawks Mar 16, 2017

Member

Fixes #5954

Member

pathawks commented Mar 16, 2017

Fixes #5954

@benbalter

Nice catch!

@parkr

parkr approved these changes Mar 20, 2017 edited

LGTM. Let's backport this to 3.4 and cut a v3.4.3.

DirtyF added a commit to DirtyF/jekyll that referenced this pull request Mar 20, 2017

@jekyllbot jekyllbot referenced this pull request Mar 21, 2017

Merged

Backport #5957 to 3.4.x #5968

@pathawks

This comment has been minimized.

Show comment
Hide comment
@pathawks

pathawks Mar 21, 2017

Member

LGTM. Let's backport this to 3.4 and cut a v3.4.3.

#5968

Does anything special need to be done to merge these? How does History.markdown work with parallel branches?

Member

pathawks commented Mar 21, 2017

LGTM. Let's backport this to 3.4 and cut a v3.4.3.

#5968

Does anything special need to be done to merge these? How does History.markdown work with parallel branches?

@parkr

This comment has been minimized.

Show comment
Hide comment
@parkr

parkr Mar 21, 2017

Member

@pathawks Thank you! In the future, you may use script/backport-pr to backport these changes. The steps I follow are:

  1. Merge this PR with @jekyllbot like normal. All your work on master is now done.
  2. Checkout the backport branch in #5968 and run all tests locally via script/cibuild. If tests pass, then merge the PR.
  3. Checkout the 3.4-stable branch. From here you will make the release. Do not commit any of the following manually, simply stage your changes.
  4. Pull the changes to ensure you have the merged code, and run script/cibuild again, just to be absolutely sure.
  5. Add an item to the History.markdown for this version & the backport PR (the syntax should be quite clear from previous releases), and bump the version in lib/jekyll/version.rb.
  6. Run bundle exec rake site:generate to generate the necessary files in docs/.
  7. Stage all changes to the History, the version file, and the docs folder but do not commit them.
  8. Run bundle exec rake release.
  9. Use git log to get the SHA-1 hash for the last commit with all your non-code changes. Checkout the master branch again, and cherry-pick that commit from the 3.4-stable branch. Make sure to re-align the histories and resolve conflicts as needed. Push this change to master (it should just update the History.markdown, the version.rb file, and some files in docs/). Once this has been properly committed, you may need to run bundle exec rake site:generate in order to get the files right, but it should work without this (famous last words!).
  10. Write a release post. If you run bundle exec rake site:releases:new[3.4.3] a properly-organized post will be created. I've had a bit of fun with the last 2 patch release posts, so feel free to write what you wish. It needn't be too long.
  11. Propose the release post in another PR and ping me. & the documentation affinity team.

Then you're done. 🎉 If you don't mind, I would love for you to do this release. You have been granted permission to publish the jekyll gem on RubyGems.org. I'll be back online tomorrow, March 21, if you have any questions. Feel free to email me or ping me in the Jekyll Slack. Thank you!

Member

parkr commented Mar 21, 2017

@pathawks Thank you! In the future, you may use script/backport-pr to backport these changes. The steps I follow are:

  1. Merge this PR with @jekyllbot like normal. All your work on master is now done.
  2. Checkout the backport branch in #5968 and run all tests locally via script/cibuild. If tests pass, then merge the PR.
  3. Checkout the 3.4-stable branch. From here you will make the release. Do not commit any of the following manually, simply stage your changes.
  4. Pull the changes to ensure you have the merged code, and run script/cibuild again, just to be absolutely sure.
  5. Add an item to the History.markdown for this version & the backport PR (the syntax should be quite clear from previous releases), and bump the version in lib/jekyll/version.rb.
  6. Run bundle exec rake site:generate to generate the necessary files in docs/.
  7. Stage all changes to the History, the version file, and the docs folder but do not commit them.
  8. Run bundle exec rake release.
  9. Use git log to get the SHA-1 hash for the last commit with all your non-code changes. Checkout the master branch again, and cherry-pick that commit from the 3.4-stable branch. Make sure to re-align the histories and resolve conflicts as needed. Push this change to master (it should just update the History.markdown, the version.rb file, and some files in docs/). Once this has been properly committed, you may need to run bundle exec rake site:generate in order to get the files right, but it should work without this (famous last words!).
  10. Write a release post. If you run bundle exec rake site:releases:new[3.4.3] a properly-organized post will be created. I've had a bit of fun with the last 2 patch release posts, so feel free to write what you wish. It needn't be too long.
  11. Propose the release post in another PR and ping me. & the documentation affinity team.

Then you're done. 🎉 If you don't mind, I would love for you to do this release. You have been granted permission to publish the jekyll gem on RubyGems.org. I'll be back online tomorrow, March 21, if you have any questions. Feel free to email me or ping me in the Jekyll Slack. Thank you!

@ashmaroli

This comment has been minimized.

Show comment
Hide comment
@ashmaroli

ashmaroli Mar 21, 2017

Member

The steps I follow are:

😮 Whoa! looks like a lot of hassle to release a patch-update with backports. (More prone to human-errors). I was under the impression that this would've been automated with a shell script and JekyllBot.

Member

ashmaroli commented Mar 21, 2017

The steps I follow are:

😮 Whoa! looks like a lot of hassle to release a patch-update with backports. (More prone to human-errors). I was under the impression that this would've been automated with a shell script and JekyllBot.

@pathawks

This comment has been minimized.

Show comment
Hide comment
@pathawks

pathawks Mar 21, 2017

Member

@parkr I'm on it. We should add these directions to https://jekyllrb.com/docs/maintaining/

Member

pathawks commented Mar 21, 2017

@parkr I'm on it. We should add these directions to https://jekyllrb.com/docs/maintaining/

@pathawks

This comment has been minimized.

Show comment
Hide comment
@pathawks

pathawks Mar 21, 2017

Member

@jekyllbot: merge +bug

Member

pathawks commented Mar 21, 2017

@jekyllbot: merge +bug

@jekyllbot jekyllbot merged commit 2907825 into master Mar 21, 2017

1 of 2 checks passed

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

@jekyllbot jekyllbot added bug fix labels Mar 21, 2017

@jekyllbot jekyllbot deleted the pull/escape_colon branch Mar 21, 2017

pathawks added a commit that referenced this pull request Mar 21, 2017

@pathawks

This comment has been minimized.

Show comment
Hide comment
@pathawks

pathawks Mar 21, 2017

Member

@parkr I'm not authorized to push to master (protected branch), so you may have to be the one to cherry-pick 610d46134688c33ebc73fdaa5bfbffe0a65d42ca to master

Edit: I can just include it in my release post PR 👍

Member

pathawks commented Mar 21, 2017

@parkr I'm not authorized to push to master (protected branch), so you may have to be the one to cherry-pick 610d46134688c33ebc73fdaa5bfbffe0a65d42ca to master

Edit: I can just include it in my release post PR 👍

@parkr

This comment has been minimized.

Show comment
Hide comment
@parkr

parkr Mar 21, 2017

Member
Member

parkr commented Mar 21, 2017

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