10000 Allow colons in `uri_escape` filter Fixes #5954 by jekyllbot · Pull Request #5957 · jekyll/jekyll · GitHub
[go: up one dir, main page]
More Web Proxy on the site http://driver.im/
Skip to content

Allow colons in uri_escape filter Fixes #5954 #5957

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.

Sign up for GitHub

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

Jump to bottom
Merged
merged 2 commits into from
Mar 21, 2017
Merged

Allow colons in uri_escape filter Fixes #5954 #5957

merged 2 commits into from
Mar 21, 2017

Conversation

jekyllbot
Copy link
Contributor

PR automatically created for @pathawks.

Allow colons in `uri_escape` filter

Fixes #5954

@pathawks
Copy link
Member

Fixes #5954

@pathawks pathawks added the fix label Mar 16, 2017
benbalter
benbalter approved these changes Mar 20, 2017
View reviewed changes
Copy link
Contributor
@benbalter benbalter left a comment

Choose a reason for hiding this comment

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

Nice catch!

parkr
parkr approved these changes Mar 20, 2017
View reviewed changes
Copy link
Member
@parkr parkr left a comment •
edited by DirtyF
Loading

Choose a reason for hiding this comment

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

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

@jekyllbot jekyllbot mentioned this pull request Mar 21, 2017
Merged
@pathawks
Copy link
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?

@parkr
Copy link
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 Backport #5957 to 3.4.x #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
Copy link
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.

@pathawks
Copy link
Member

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

@pathawks
Copy link
Member

@jekyllbot: merge +bug

@jekyllbot jekyllbot merged commit 2907825 into master Mar 21, 2017
@jekyllbot jekyllbot deleted the pull/escape_colon branch March 21, 2017 13:12
jekyllbot added a commit that referenced this pull request Mar 21, 2017
@jekyllbot
Update history to reflect merge of #5957 [ci skip]
d592f57
pathawks added a commit that referenced this pull request Mar 21, 2017
@pathawks
Merge pull request #5968 from /pull/3.4-escape_colon
93a6ee6 
Backport #5957 to 3.4.x
@pathawks
Copy link
Member
pathawks commented Mar 21, 2017 •
edited
Loading

@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
Copy link
Member
parkr commented Mar 21, 2017 via email

@jekyll jekyll locked and limited conversation to collaborators Jul 11, 2019
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Reviewers

@parkr parkr parkr approved these changes

@benbalter benbalter benbalter approved these changes

Assignees

@parkr parkr

Labels
fix frozen-due-to-age
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
5 participants
@jekyllbot @pathawks @parkr @ashmaroli @benbalter
0