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.

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

General improvements for WEBrick via jekyll serve #4224

Merged
merged 1 commit into from Dec 4, 2015
Merged

General improvements for WEBrick via jekyll serve #4224

merged 1 commit into from Dec 4, 2015

Conversation

jekyllbot
Copy link
Contributor

PR automatically created for @envygeeks.

Fix #3791/#3478

  • Add support for SSL through command line switches.
  • Add suppport for file/index.html > file.html > directory.
  • Add support for custom-headers through configuration.
  • Modernize and split up the serve.
  • Add a few basic tests.

@envygeeks envygeeks changed the title Fix #3791/#3478 * Add support for SSL through command line switches. * Add suppport for file/index.html > file.html > directory. * Add support for custom-headers through configuration. * Modernize and split up the serve. * Add a few basic tests. Fix #3791/#3478 Dec 4, 2015
@envygeeks
Copy link
Contributor

Woah there captain bot, I think you be needing to just use the short description :P

@parkr parkr changed the title Fix #3791/#3478 General improvements for WEBrick via jekyll serve Dec 4, 2015
@parkr
Copy link
Member

parkr commented Dec 4, 2015

@envygeeks I can change it so it uses just the first line of the commit message as long as it's not "Fix #XXX/#XXX" because that's not useful as a PR title :)

parkr
parkr reviewed Dec 4, 2015
View reviewed changes
lib/jekyll/commands/serve.rb

"ssl_key" => ["--ssl-key [KEY]", "X.509 (SSL) Private Key."],
"ssl_cert" => ["--ssl-cert [CERT]", "X.509 (SSL) certificate."],
"baseurl" => ["-b", "--baseurl [URL]", "Base URL"]
Copy link
Member

Choose a reason for hiding this comment

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

We align at the =>

"open_url" => ["-o"],
"detach"   => ["-B"],
# ... etc

Copy link
Contributor

Choose a reason for hiding this comment

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

Fixed.

@envygeeks
Copy link
Contributor

That's a good idea, because I used that short main message because the more described everything in more detail so I guess it would be better for it to resort to the entire thing in this case.

Fix #3791/#3478
8efbdc0 
* Add support for SSL through command line switches.
* Add suppport for file/index.html > file.html > directory.
* Add support for custom-headers through configuration.
* Modernize and split up the serve.
* Add a few basic tests.
@envygeeks envygeeks force-pushed the pull/cleanup-and-modernize-serve-cmd branch from b27fda7 to 8efbdc0 Compare December 4, 2015 20:07
@envygeeks envygeeks added this to the 3.1 milestone Dec 4, 2015
@envygeeks envygeeks self-assigned this Dec 4, 2015
parkr added a commit that referenced this pull request Dec 4, 2015
@parkr
Merge pull request #4224 from jekyll/pull/cleanup-and-modernize-serve…
313582f 
…-cmd

Merge pull request 4224
@parkr parkr merged commit 313582f into master Dec 4, 2015
@parkr parkr deleted the pull/cleanup-and-modernize-serve-cmd branch December 4, 2015 21:16
parkr added a commit that referenced this pull request Dec 4, 2015
@parkr
Update history to reflect merge of #4224
dd971a3 
[ci skip]
@parkr
Copy link
Member

parkr commented Dec 4, 2015

Thank you, @envygeeks!

@jekyll jekyll locked and limited conversation to collaborators Feb 27, 2017
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Reviewers
No reviews
Assignees

@envygeeks envygeeks

Labels
feature frozen-due-to-age
Projects
None yet
Milestone
3.1
Development

Successfully merging this pull request may close these issues.

Jekyll local development over https
3 participants
@jekyllbot @envygeeks @parkr