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 permalink template to have underscores #5572

Merged
merged 7 commits into from Nov 14, 2016

Conversation

Projects
None yet
4 participants
@parkr
Member

parkr commented Nov 10, 2016

Fixes #5330.

/cc @qpwo

@parkr parkr added bug fix labels Nov 10, 2016

@parkr parkr added this to the 3.3.1 milestone Nov 10, 2016

@parkr

This comment has been minimized.

Show comment
Hide comment
@parkr
Member

parkr commented Nov 10, 2016

@parkr

This comment has been minimized.

Show comment
Hide comment
@parkr

parkr Nov 10, 2016

Member

@jekyll/core Please review!

Member

parkr commented Nov 10, 2016

@jekyll/core Please review!

@oe

This comment has been minimized.

Show comment
Hide comment
@oe

oe Nov 11, 2016

Member

nice, i've been waiting for this one for ages. LGTM

Member

oe commented Nov 11, 2016

nice, i've been waiting for this one for ages. LGTM

@oe

This comment has been minimized.

Show comment
Hide comment
@oe

oe Nov 11, 2016

Member

@parkr actually, what good does it do to have a team leader assigned to a PR when they can't even approve it? it seems weird to me

(also, are there any ways to contact you privately?)

Member

oe commented Nov 11, 2016

@parkr actually, what good does it do to have a team leader assigned to a PR when they can't even approve it? it seems weird to me

(also, are there any ways to contact you privately?)

parkr added some commits Nov 10, 2016

Show outdated Hide outdated lib/jekyll/url.rb
@@ -84,17 +84,36 @@ def generate_url_from_hash(template)
end
end
# We include underscores in keys to allow for 'i_month' and so forth.
# This poses a problem for keys which are followed by and underscore

This comment has been minimized.

@ashmaroli

ashmaroli Nov 12, 2016

Member

small typo: it should be an underscore instead of and underscore

@ashmaroli

ashmaroli Nov 12, 2016

Member

small typo: it should be an underscore instead of and underscore

This comment has been minimized.

@parkr

parkr Nov 14, 2016

Member

Thank you! Updated.

@parkr

parkr Nov 14, 2016

Member

Thank you! Updated.

Show outdated Hide outdated lib/jekyll/url.rb
# This poses a problem for keys which are followed by and underscore
# but the underscore is not part of the key, e.g. '/:month_:day'.
# That should be :month and :day, but our key extraction regexp isn't
# smart enough to know that so we have to make it an explicit

This comment has been minimized.

@ashmaroli

ashmaroli Nov 12, 2016

Member

personal nit: it would be better to have a , (comma) between ..that and so.. 😃

@ashmaroli

ashmaroli Nov 12, 2016

Member

personal nit: it would be better to have a , (comma) between ..that and so.. 😃

"".freeze
else
self.class.escape_path(@placeholders[key])
pool = possible_keys(match.sub(":".freeze, "".freeze))

This comment has been minimized.

@ashmaroli

ashmaroli Nov 12, 2016

Member

casual query: why do we have to explicitly freeze the strings here? 🤔

@ashmaroli

ashmaroli Nov 12, 2016

Member

casual query: why do we have to explicitly freeze the strings here? 🤔

This comment has been minimized.

@parkr

parkr Nov 14, 2016

Member

It's a virtual machine optimization.

@parkr

parkr Nov 14, 2016

Member

It's a virtual machine optimization.

@parkr

This comment has been minimized.

Show comment
Hide comment
@parkr

parkr Nov 14, 2016

Member

@parkr actually, what good does it do to have a team leader assigned to a PR when they can't even approve it? it seems weird to me

@fene You can approve! If you go to the Files tab, I believe you can approve this. There are some weird nuances with

(also, are there any ways to contact you privately?)

Yes! By email, listed on my GitHub profile. I don't check it very often as I get a lot of spam. Did you email me? I'll check it now!

Member

parkr commented Nov 14, 2016

@parkr actually, what good does it do to have a team leader assigned to a PR when they can't even approve it? it seems weird to me

@fene You can approve! If you go to the Files tab, I believe you can approve this. There are some weird nuances with

(also, are there any ways to contact you privately?)

Yes! By email, listed on my GitHub profile. I don't check it very often as I get a lot of spam. Did you email me? I'll check it now!

@parkr parkr changed the title from Add failing test for permalink templates with trailing underscores to Allow permalink template to have underscores Nov 14, 2016

@parkr

This comment has been minimized.

Show comment
Hide comment
@parkr

parkr Nov 14, 2016

Member

@jekyllbot: merge +bug

Member

parkr commented Nov 14, 2016

@jekyllbot: merge +bug

@jekyllbot jekyllbot merged commit 88a338d into master Nov 14, 2016

2 checks passed

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

@jekyllbot jekyllbot added bug fix labels Nov 14, 2016

@jekyllbot jekyllbot deleted the fix-underscore-in-permalink branch Nov 14, 2016

jekyllbot added a commit that referenced this pull request Nov 14, 2016

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