jekyll-docs 3.6.0 → 3.6.1
Sign up to get free protection for your applications and to get access to all the features.
- checksums.yaml +4 -4
- data/lib/jekyll.rb +195 -0
- data/lib/jekyll/cleaner.rb +110 -0
- data/lib/jekyll/collection.rb +230 -0
- data/lib/jekyll/command.rb +78 -0
- data/lib/jekyll/commands/build.rb +102 -0
- data/lib/jekyll/commands/clean.rb +43 -0
- data/lib/jekyll/commands/doctor.rb +153 -0
- data/lib/jekyll/commands/help.rb +34 -0
- data/lib/jekyll/commands/new.rb +156 -0
- data/lib/jekyll/commands/new_theme.rb +40 -0
- data/lib/jekyll/commands/serve.rb +245 -0
- data/lib/jekyll/commands/serve/servlet.rb +62 -0
- data/lib/jekyll/configuration.rb +410 -0
- data/lib/jekyll/converter.rb +54 -0
- data/lib/jekyll/converters/identity.rb +23 -0
- data/lib/jekyll/converters/markdown.rb +104 -0
- data/lib/jekyll/converters/markdown/kramdown_parser.rb +123 -0
- data/lib/jekyll/converters/markdown/rdiscount_parser.rb +35 -0
- data/lib/jekyll/converters/markdown/redcarpet_parser.rb +108 -0
- data/lib/jekyll/converters/smartypants.rb +36 -0
- data/lib/jekyll/convertible.rb +251 -0
- data/lib/jekyll/deprecator.rb +52 -0
- data/lib/jekyll/document.rb +507 -0
- data/lib/jekyll/drops/collection_drop.rb +22 -0
- data/lib/jekyll/drops/document_drop.rb +69 -0
- data/lib/jekyll/drops/drop.rb +214 -0
- data/lib/jekyll/drops/excerpt_drop.rb +15 -0
- data/lib/jekyll/drops/jekyll_drop.rb +33 -0
- data/lib/jekyll/drops/site_drop.rb +47 -0
- data/lib/jekyll/drops/static_file_drop.rb +13 -0
- data/lib/jekyll/drops/unified_payload_drop.rb +25 -0
- data/lib/jekyll/drops/url_drop.rb +88 -0
- data/lib/jekyll/entry_filter.rb +123 -0
- data/lib/jekyll/errors.rb +20 -0
- data/lib/jekyll/excerpt.rb +126 -0
- data/lib/jekyll/external.rb +74 -0
- data/lib/jekyll/filters.rb +430 -0
- data/lib/jekyll/filters/grouping_filters.rb +65 -0
- data/lib/jekyll/filters/url_filters.rb +60 -0
- data/lib/jekyll/frontmatter_defaults.rb +197 -0
- data/lib/jekyll/generator.rb +5 -0
- data/lib/jekyll/hooks.rb +104 -0
- data/lib/jekyll/layout.rb +62 -0
- data/lib/jekyll/liquid_extensions.rb +24 -0
- data/lib/jekyll/liquid_renderer.rb +49 -0
- data/lib/jekyll/liquid_renderer/file.rb +56 -0
- data/lib/jekyll/liquid_renderer/table.rb +96 -0
- data/lib/jekyll/log_adapter.rb +147 -0
- data/lib/jekyll/mime.types +825 -0
- data/lib/jekyll/page.rb +187 -0
- data/lib/jekyll/plugin.rb +98 -0
- data/lib/jekyll/plugin_manager.rb +113 -0
- data/lib/jekyll/publisher.rb +23 -0
- data/lib/jekyll/reader.rb +134 -0
- data/lib/jekyll/readers/collection_reader.rb +22 -0
- data/lib/jekyll/readers/data_reader.rb +77 -0
- data/lib/jekyll/readers/layout_reader.rb +71 -0
- data/lib/jekyll/readers/page_reader.rb +25 -0
- data/lib/jekyll/readers/post_reader.rb +72 -0
- data/lib/jekyll/readers/static_file_reader.rb +25 -0
- data/lib/jekyll/readers/theme_assets_reader.rb +49 -0
- data/lib/jekyll/regenerator.rb +201 -0
- data/lib/jekyll/related_posts.rb +52 -0
- data/lib/jekyll/renderer.rb +269 -0
- data/lib/jekyll/site.rb +471 -0
- data/lib/jekyll/static_file.rb +162 -0
- data/lib/jekyll/stevenson.rb +61 -0
- data/lib/jekyll/tags/highlight.rb +141 -0
- data/lib/jekyll/tags/include.rb +215 -0
- data/lib/jekyll/tags/link.rb +37 -0
- data/lib/jekyll/tags/post_url.rb +103 -0
- data/lib/jekyll/theme.rb +68 -0
- data/lib/jekyll/theme_builder.rb +119 -0
- data/lib/jekyll/url.rb +161 -0
- data/lib/jekyll/utils.rb +337 -0
- data/lib/jekyll/utils/ansi.rb +59 -0
- data/lib/jekyll/utils/exec.rb +27 -0
- data/lib/jekyll/utils/platforms.rb +82 -0
- data/lib/jekyll/utils/rouge.rb +21 -0
- data/lib/jekyll/utils/win_tz.rb +75 -0
- data/lib/jekyll/version.rb +5 -0
- data/lib/site_template/404.html +24 -0
- data/lib/site_template/_config.yml +43 -0
- data/lib/site_template/_posts/0000-00-00-welcome-to-jekyll.markdown.erb +25 -0
- data/lib/site_template/about.md +18 -0
- data/lib/site_template/index.md +6 -0
- data/lib/theme_template/CODE_OF_CONDUCT.md.erb +74 -0
- data/lib/theme_template/Gemfile +4 -0
- data/lib/theme_template/LICENSE.txt.erb +21 -0
- data/lib/theme_template/README.md.erb +52 -0
- data/lib/theme_template/_layouts/default.html +1 -0
- data/lib/theme_template/_layouts/page.html +5 -0
- data/lib/theme_template/_layouts/post.html +5 -0
- data/lib/theme_template/example/_config.yml.erb +1 -0
- data/lib/theme_template/example/_post.md +12 -0
- data/lib/theme_template/example/index.html +14 -0
- data/lib/theme_template/example/style.scss +7 -0
- data/lib/theme_template/gitignore.erb +5 -0
- data/lib/theme_template/theme.gemspec.erb +19 -0
- metadata +103 -156
- data/lib/jekyll-docs.rb +0 -31
- data/site/404.html +0 -153
- data/site/CNAME +0 -1
- data/site/community/index.html +0 -299
- data/site/conduct/index.html +0 -10
- data/site/css/screen.css +0 -1
- data/site/docs/assets/index.html +0 -724
- data/site/docs/code_of_conduct/index.html +0 -730
- data/site/docs/collections/index.html +0 -1097
- data/site/docs/conduct/index.html +0 -744
- data/site/docs/configuration/index.html +0 -1403
- data/site/docs/continuous-integration/buddyworks/index.html +0 -726
- data/site/docs/continuous-integration/circleci/index.html +0 -757
- data/site/docs/continuous-integration/index.html +0 -681
- data/site/docs/continuous-integration/travis-ci/index.html +0 -891
- data/site/docs/contributing/index.html +0 -863
- data/site/docs/datafiles/index.html +0 -780
- data/site/docs/deployment-methods/index.html +0 -875
- data/site/docs/drafts/index.html +0 -636
- data/site/docs/extras/index.html +0 -689
- data/site/docs/frontmatter/index.html +0 -807
- data/site/docs/github-pages/index.html +0 -819
- data/site/docs/history/index.html +0 -3955
- data/site/docs/home/index.html +0 -644
- data/site/docs/includes/index.html +0 -800
- data/site/docs/index.html +0 -10
- data/site/docs/installation/index.html +0 -732
- data/site/docs/maintaining/affinity-team-captain/index.html +0 -706
- data/site/docs/maintaining/avoiding-burnout/index.html +0 -709
- data/site/docs/maintaining/becoming-a-maintainer/index.html +0 -717
- data/site/docs/maintaining/index.html +0 -713
- data/site/docs/maintaining/merging-a-pull-request/index.html +0 -747
- data/site/docs/maintaining/reviewing-a-pull-request/index.html +0 -725
- data/site/docs/maintaining/special-labels/index.html +0 -705
- data/site/docs/maintaining/triaging-an-issue/index.html +0 -735
- data/site/docs/migrations/index.html +0 -647
- data/site/docs/pages/index.html +0 -695
- data/site/docs/pagination/index.html +0 -870
- data/site/docs/permalinks/index.html +0 -1027
- data/site/docs/plugins/index.html +0 -1800
- data/site/docs/posts/index.html +0 -858
- data/site/docs/quickstart/index.html +0 -650
- data/site/docs/resources/index.html +0 -769
- data/site/docs/sites/index.html +0 -702
- data/site/docs/static-files/index.html +0 -720
- data/site/docs/structure/index.html +0 -822
- data/site/docs/templates/index.html +0 -1208
- data/site/docs/themes/index.html +0 -935
- data/site/docs/troubleshooting/index.html +0 -893
- data/site/docs/upgrading/0-to-2/index.html +0 -826
- data/site/docs/upgrading/2-to-3/index.html +0 -824
- data/site/docs/upgrading/index.html +0 -693
- data/site/docs/usage/index.html +0 -705
- data/site/docs/variables/index.html +0 -1048
- data/site/docs/windows/index.html +0 -799
- data/site/favicon.ico +0 -0
- data/site/feed.xml +0 -372
- data/site/fonts/FontAwesome.eot +0 -0
- data/site/fonts/FontAwesome.svg +0 -12
- data/site/fonts/FontAwesome.ttf +0 -0
- data/site/fonts/FontAwesome.woff +0 -0
- data/site/github.html +0 -10
- data/site/help/index.html +0 -244
- data/site/icomoon-selection.json +0 -96
- data/site/img/article-footer.png +0 -0
- data/site/img/footer-arrow.png +0 -0
- data/site/img/footer-logo.png +0 -0
- data/site/img/jekyll-sticker.jpg +0 -0
- data/site/img/jekylllayoutconcept.png +0 -0
- data/site/img/logo-2x.png +0 -0
- data/site/img/logo-rss.png +0 -0
- data/site/img/octojekyll.png +0 -0
- data/site/index.html +0 -267
- data/site/issues.html +0 -10
- data/site/js/html5shiv.min.js +0 -4
- data/site/js/respond.min.js +0 -5
- data/site/latest_version.txt +0 -1
- data/site/news/2013/05/05/jekyll-1-0-0-released/index.html +0 -570
- data/site/news/2013/05/08/jekyll-1-0-1-released/index.html +0 -570
- data/site/news/2013/05/12/jekyll-1-0-2-released/index.html +0 -571
- data/site/news/2013/06/07/jekyll-1-0-3-released/index.html +0 -568
- data/site/news/2013/07/14/jekyll-1-1-0-released/index.html +0 -570
- data/site/news/2013/07/24/jekyll-1-1-1-released/index.html +0 -569
- data/site/news/2013/07/25/jekyll-1-0-4-released/index.html +0 -565
- data/site/news/2013/07/25/jekyll-1-1-2-released/index.html +0 -565
- data/site/news/2013/09/06/jekyll-1-2-0-released/index.html +0 -572
- data/site/news/2013/09/14/jekyll-1-2-1-released/index.html +0 -566
- data/site/news/2013/10/28/jekyll-1-3-0-rc1-released/index.html +0 -564
- data/site/news/2013/11/04/jekyll-1-3-0-released/index.html +0 -599
- data/site/news/2013/11/26/jekyll-1-3-1-released/index.html +0 -568
- data/site/news/2013/12/07/jekyll-1-4-0-released/index.html +0 -583
- data/site/news/2013/12/09/jekyll-1-4-1-released/index.html +0 -565
- data/site/news/2013/12/16/jekyll-1-4-2-released/index.html +0 -564
- data/site/news/2014/01/13/jekyll-1-4-3-released/index.html +0 -573
- data/site/news/2014/03/24/jekyll-1-5-0-released/index.html +0 -564
- data/site/news/2014/03/27/jekyll-1-5-1-released/index.html +0 -569
- data/site/news/2014/05/06/jekyll-turns-2-0-0/index.html +0 -585
- data/site/news/2014/05/08/jekyll-2-0-3-released/index.html +0 -565
- data/site/news/2014/06/04/jekyll-stickers-1-dollar-stickermule/index.html +0 -567
- data/site/news/2014/06/28/jekyll-turns-21-i-mean-2-1-0/index.html +0 -582
- data/site/news/2014/07/01/jekyll-2-1-1-released/index.html +0 -579
- data/site/news/2014/07/29/jekyll-2-2-0-released/index.html +0 -568
- data/site/news/2014/08/10/jekyll-2-3-0-released/index.html +0 -588
- data/site/news/2014/09/09/jekyll-2-4-0-released/index.html +0 -574
- data/site/news/2014/11/05/jekylls-midlife-crisis-jekyll-turns-2-5-0/index.html +0 -597
- data/site/news/2014/11/09/jekyll-2-5-1-released/index.html +0 -575
- data/site/news/2014/11/12/jekyll-2-5-2-released/index.html +0 -565
- data/site/news/2014/12/17/alfredxing-welcome-to-jekyll-core/index.html +0 -572
- data/site/news/2014/12/22/jekyll-2-5-3-released/index.html +0 -567
- data/site/news/2015/01/20/jekyll-meet-and-greet/index.html +0 -568
- data/site/news/2015/01/24/jekyll-3-0-0-beta1-released/index.html +0 -588
- data/site/news/2015/02/26/introducing-jekyll-talk/index.html +0 -563
- data/site/news/2015/10/26/jekyll-3-0-released/index.html +0 -592
- data/site/news/2015/11/17/jekyll-3-0-1-released/index.html +0 -576
- data/site/news/2016/01/20/jekyll-3-0-2-released/index.html +0 -566
- data/site/news/2016/01/24/jekyll-3-1-0-released/index.html +0 -599
- data/site/news/2016/01/28/jekyll-3-1-1-released/index.html +0 -583
- data/site/news/2016/02/08/jekyll-3-0-3-released/index.html +0 -578
- data/site/news/2016/02/19/jekyll-3-1-2-released/index.html +0 -569
- data/site/news/2016/03/10/making-it-easier-to-contribute-to-jekyll/index.html +0 -565
- data/site/news/2016/04/19/jekyll-3-0-4-released/index.html +0 -571
- data/site/news/2016/04/19/jekyll-3-1-3-released/index.html +0 -566
- data/site/news/2016/04/26/jekyll-3-0-5-released/index.html +0 -572
- data/site/news/2016/05/18/jekyll-3-1-4-released/index.html +0 -576
- data/site/news/2016/05/18/jekyll-3-1-5-released/index.html +0 -564
- data/site/news/2016/05/19/jekyll-3-1-6-released/index.html +0 -566
- data/site/news/2016/06/03/update-on-jekyll-s-google-summer-of-code-projects/index.html +0 -567
- data/site/news/2016/07/26/jekyll-3-2-0-released/index.html +0 -676
- data/site/news/2016/08/02/jekyll-3-2-1-released/index.html +0 -571
- data/site/news/2016/08/24/jekyll-admin-initial-release/index.html +0 -566
- data/site/news/2016/10/06/jekyll-3-3-is-here/index.html +0 -645
- data/site/news/2016/11/14/jekyll-3-3-1-released/index.html +0 -569
- data/site/news/2017/01/18/jekyll-3-4-0-released/index.html +0 -592
- data/site/news/2017/03/02/jekyll-3-4-1-released/index.html +0 -649
- data/site/news/2017/03/09/jekyll-3-4-2-released/index.html +0 -598
- data/site/news/2017/03/21/jekyll-3-4-3-released/index.html +0 -594
- data/site/news/2017/06/15/jekyll-3-5-0-released/index.html +0 -589
- data/site/news/2017/07/17/jekyll-3-5-1-released/index.html +0 -569
- data/site/news/2017/08/12/jekyll-3-5-2-released/index.html +0 -573
- data/site/news/2017/09/21/jekyll-3-6-0-released/index.html +0 -565
- data/site/news/index.html +0 -3609
- data/site/news/releases/index.html +0 -3344
- data/site/philosophy.html +0 -46
- data/site/readme.md +0 -23
- data/site/robots.txt +0 -1
- data/site/sitemap.xml +0 -485
- data/site/tutorials/convert-site-to-jekyll/index.html +0 -793
- data/site/tutorials/custom-404-page/index.html +0 -358
- data/site/tutorials/home/index.html +0 -323
- data/site/tutorials/index.html +0 -10
- data/site/tutorials/navigation/index.html +0 -872
- data/site/tutorials/orderofinterpretation/index.html +0 -441
@@ -1,747 +0,0 @@
|
|
1
|
-
<!DOCTYPE HTML>
|
2
|
-
<html lang="en-US">
|
3
|
-
<head>
|
4
|
-
<meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
|
5
|
-
<meta charset="UTF-8">
|
6
|
-
<meta name="viewport" content="width=device-width,initial-scale=1">
|
7
|
-
<meta name="generator" content="Jekyll v3.6.0">
|
8
|
-
<link type="application/atom+xml" rel="alternate" href="https://jekyllrb.com/feed.xml" title="Jekyll • Simple, blog-aware, static sites">
|
9
|
-
<link rel="alternate" type="application/atom+xml" title="Recent commits to Jekyll’s master branch" href="https://github.com/jekyll/jekyll/commits/master.atom">
|
10
|
-
<link rel="stylesheet" href="//fonts.googleapis.com/css?family=Lato:300,300italic,400,400italic,700,700italic,900">
|
11
|
-
<link rel="stylesheet" href="/css/screen.css">
|
12
|
-
<link rel="icon" type="image/x-icon" href="/favicon.ico">
|
13
|
-
<!-- Begin Jekyll SEO tag v2.3.0 -->
|
14
|
-
<title>Merging a Pull Request | Jekyll • Simple, blog-aware, static sites</title>
|
15
|
-
<meta property="og:title" content="Merging a Pull Request">
|
16
|
-
<meta property="og:locale" content="en_US">
|
17
|
-
<meta name="description" content="This guide is for maintainers. These special people have write access to one or more of Jekyll’s repositories and help merge the contributions of others. You may find what is written here interesting, but it’s definitely not for everyone.">
|
18
|
-
<meta property="og:description" content="This guide is for maintainers. These special people have write access to one or more of Jekyll’s repositories and help merge the contributions of others. You may find what is written here interesting, but it’s definitely not for everyone.">
|
19
|
-
<link rel="canonical" href="https://jekyllrb.com/docs/maintaining/merging-a-pull-request/">
|
20
|
-
<meta property="og:url" content="https://jekyllrb.com/docs/maintaining/merging-a-pull-request/">
|
21
|
-
<meta property="og:site_name" content="Jekyll • Simple, blog-aware, static sites">
|
22
|
-
<meta property="og:type" content="article">
|
23
|
-
<meta property="article:published_time" content="2017-10-24T08:07:43-07:00">
|
24
|
-
<meta name="twitter:card" content="summary">
|
25
|
-
<meta name="twitter:site" content="@jekyllrb">
|
26
|
-
<meta name="google-site-verification" content="onQcXpAvtHBrUI5LlroHNE_FP0b2qvFyPq7VZw36iEY">
|
27
|
-
<script type="application/ld+json">
|
28
|
-
{"name":null,"description":"This guide is for maintainers. These special people have write access to one or more of Jekyll’s repositories and help merge the contributions of others. You may find what is written here interesting, but it’s definitely not for everyone.","url":"https://jekyllrb.com/docs/maintaining/merging-a-pull-request/","headline":"Merging a Pull Request","dateModified":"2017-10-24T08:07:43-07:00","datePublished":"2017-10-24T08:07:43-07:00","sameAs":null,"@type":"BlogPosting","author":null,"image":null,"publisher":{"@type":"Organization","logo":{"@type":"ImageObject","url":"https://jekyllrb.com/img/logo-2x.png"}},"mainEntityOfPage":{"@type":"WebPage","@id":"https://jekyllrb.com/docs/maintaining/merging-a-pull-request/"},"@context":"http://schema.org"}</script>
|
29
|
-
<!-- End Jekyll SEO tag -->
|
30
|
-
|
31
|
-
<!--[if lt IE 9]>
|
32
|
-
<script src="/js/html5shiv.min.js"></script>
|
33
|
-
<script src="/js/respond.min.js"></script>
|
34
|
-
<![endif]-->
|
35
|
-
</head>
|
36
|
-
|
37
|
-
|
38
|
-
<body class="wrap">
|
39
|
-
<header>
|
40
|
-
<nav class="mobile-nav show-on-mobiles">
|
41
|
-
<ul>
|
42
|
-
<li class="">
|
43
|
-
<a href="/">Home</a>
|
44
|
-
</li>
|
45
|
-
<li class="current">
|
46
|
-
<a href="/docs/home/">Docs</a>
|
47
|
-
</li>
|
48
|
-
<li class="">
|
49
|
-
<a href="/news/">News</a>
|
50
|
-
</li>
|
51
|
-
<li class="">
|
52
|
-
<a href="/community/">Community</a>
|
53
|
-
</li>
|
54
|
-
<li class="">
|
55
|
-
<a href="/help/">Help</a>
|
56
|
-
</li>
|
57
|
-
<li>
|
58
|
-
<a href="https://github.com/jekyll/jekyll">GitHub</a>
|
59
|
-
</li>
|
60
|
-
</ul>
|
61
|
-
|
62
|
-
</nav>
|
63
|
-
<div class="grid">
|
64
|
-
<div class="unit one-third center-on-mobiles">
|
65
|
-
<h1>
|
66
|
-
<a href="/">
|
67
|
-
<span class="sr-only">Jekyll</span>
|
68
|
-
<img src="/img/logo-2x.png" width="249" height="115" alt="Jekyll Logo">
|
69
|
-
</a>
|
70
|
-
</h1>
|
71
|
-
</div>
|
72
|
-
<nav class="main-nav unit two-thirds hide-on-mobiles">
|
73
|
-
<ul>
|
74
|
-
<li class="">
|
75
|
-
<a href="/">Home</a>
|
76
|
-
</li>
|
77
|
-
<li class="current">
|
78
|
-
<a href="/docs/home/">Docs</a>
|
79
|
-
</li>
|
80
|
-
<li class="">
|
81
|
-
<a href="/news/">News</a>
|
82
|
-
</li>
|
83
|
-
<li class="">
|
84
|
-
<a href="/community/">Community</a>
|
85
|
-
</li>
|
86
|
-
<li class="">
|
87
|
-
<a href="/help/">Help</a>
|
88
|
-
</li>
|
89
|
-
<li>
|
90
|
-
<a href="https://github.com/jekyll/jekyll">GitHub</a>
|
91
|
-
</li>
|
92
|
-
</ul>
|
93
|
-
|
94
|
-
</nav>
|
95
|
-
</div>
|
96
|
-
</header>
|
97
|
-
|
98
|
-
|
99
|
-
<section class="docs">
|
100
|
-
<div class="grid">
|
101
|
-
|
102
|
-
<div class="docs-nav-mobile unit whole show-on-mobiles">
|
103
|
-
<select onchange="if (this.value) window.location.href=this.value">
|
104
|
-
<option value="">Navigate the docs…</option>
|
105
|
-
|
106
|
-
<optgroup label="Getting Started">
|
107
|
-
|
108
|
-
|
109
|
-
|
110
|
-
<option value="/docs/home/">Welcome</option>
|
111
|
-
|
112
|
-
|
113
|
-
|
114
|
-
<option value="/docs/quickstart/">Quick-start guide</option>
|
115
|
-
|
116
|
-
|
117
|
-
|
118
|
-
<option value="/docs/installation/">Installation</option>
|
119
|
-
|
120
|
-
|
121
|
-
|
122
|
-
<option value="/docs/windows/">Jekyll on Windows</option>
|
123
|
-
|
124
|
-
|
125
|
-
|
126
|
-
<option value="/docs/usage/">Basic Usage</option>
|
127
|
-
|
128
|
-
|
129
|
-
|
130
|
-
<option value="/docs/structure/">Directory structure</option>
|
131
|
-
|
132
|
-
|
133
|
-
|
134
|
-
<option value="/docs/configuration/">Configuration</option>
|
135
|
-
|
136
|
-
|
137
|
-
</optgroup>
|
138
|
-
|
139
|
-
<optgroup label="Your Content">
|
140
|
-
|
141
|
-
|
142
|
-
|
143
|
-
<option value="/docs/frontmatter/">Front Matter</option>
|
144
|
-
|
145
|
-
|
146
|
-
|
147
|
-
<option value="/docs/posts/">Writing posts</option>
|
148
|
-
|
149
|
-
|
150
|
-
|
151
|
-
<option value="/docs/drafts/">Working with drafts</option>
|
152
|
-
|
153
|
-
|
154
|
-
|
155
|
-
<option value="/docs/pages/">Creating pages</option>
|
156
|
-
|
157
|
-
|
158
|
-
|
159
|
-
<option value="/docs/static-files/">Static Files</option>
|
160
|
-
|
161
|
-
|
162
|
-
|
163
|
-
<option value="/docs/variables/">Variables</option>
|
164
|
-
|
165
|
-
|
166
|
-
|
167
|
-
<option value="/docs/collections/">Collections</option>
|
168
|
-
|
169
|
-
|
170
|
-
|
171
|
-
<option value="/docs/datafiles/">Data Files</option>
|
172
|
-
|
173
|
-
|
174
|
-
|
175
|
-
<option value="/docs/assets/">Assets</option>
|
176
|
-
|
177
|
-
|
178
|
-
|
179
|
-
<option value="/docs/migrations/">Blog migrations</option>
|
180
|
-
|
181
|
-
|
182
|
-
</optgroup>
|
183
|
-
|
184
|
-
<optgroup label="Customization">
|
185
|
-
|
186
|
-
|
187
|
-
|
188
|
-
<option value="/docs/templates/">Templates</option>
|
189
|
-
|
190
|
-
|
191
|
-
|
192
|
-
<option value="/docs/includes/">Includes</option>
|
193
|
-
|
194
|
-
|
195
|
-
|
196
|
-
<option value="/docs/permalinks/">Permalinks</option>
|
197
|
-
|
198
|
-
|
199
|
-
|
200
|
-
<option value="/docs/pagination/">Pagination</option>
|
201
|
-
|
202
|
-
|
203
|
-
|
204
|
-
<option value="/docs/plugins/">Plugins</option>
|
205
|
-
|
206
|
-
|
207
|
-
|
208
|
-
<option value="/docs/themes/">Themes</option>
|
209
|
-
|
210
|
-
|
211
|
-
|
212
|
-
<option value="/docs/extras/">Extras</option>
|
213
|
-
|
214
|
-
|
215
|
-
</optgroup>
|
216
|
-
|
217
|
-
<optgroup label="Deployment">
|
218
|
-
|
219
|
-
|
220
|
-
|
221
|
-
<option value="/docs/github-pages/">GitHub Pages</option>
|
222
|
-
|
223
|
-
|
224
|
-
|
225
|
-
<option value="/docs/deployment-methods/">Deployment methods</option>
|
226
|
-
|
227
|
-
|
228
|
-
|
229
|
-
<option value="/docs/continuous-integration/">Continuous Integration</option>
|
230
|
-
|
231
|
-
|
232
|
-
</optgroup>
|
233
|
-
|
234
|
-
<optgroup label="Miscellaneous">
|
235
|
-
|
236
|
-
|
237
|
-
|
238
|
-
<option value="/docs/troubleshooting/">Troubleshooting</option>
|
239
|
-
|
240
|
-
|
241
|
-
|
242
|
-
<option value="/docs/sites/">Sites using Jekyll</option>
|
243
|
-
|
244
|
-
|
245
|
-
|
246
|
-
<option value="/docs/resources/">Resources</option>
|
247
|
-
|
248
|
-
|
249
|
-
|
250
|
-
<option value="/docs/upgrading/0-to-2/">Upgrading from 0.x to 2.x</option>
|
251
|
-
|
252
|
-
|
253
|
-
|
254
|
-
<option value="/docs/upgrading/2-to-3/">Upgrading from 2.x to 3.x</option>
|
255
|
-
|
256
|
-
|
257
|
-
</optgroup>
|
258
|
-
|
259
|
-
<optgroup label="Meta">
|
260
|
-
|
261
|
-
|
262
|
-
|
263
|
-
<option value="/docs/contributing/">Contributing</option>
|
264
|
-
|
265
|
-
|
266
|
-
|
267
|
-
<option value="/docs/maintaining/">Maintaining Jekyll</option>
|
268
|
-
|
269
|
-
|
270
|
-
|
271
|
-
<option value="/docs/conduct/">Code of Conduct</option>
|
272
|
-
|
273
|
-
|
274
|
-
|
275
|
-
<option value="/docs/history/">History</option>
|
276
|
-
|
277
|
-
|
278
|
-
</optgroup>
|
279
|
-
|
280
|
-
</select>
|
281
|
-
</div>
|
282
|
-
|
283
|
-
|
284
|
-
<div class="unit four-fifths">
|
285
|
-
<article>
|
286
|
-
<div class="improve right hide-on-mobiles">
|
287
|
-
<a href="https://github.com/jekyll/jekyll/edit/master/docs/_docs/maintaining/merging-a-pull-request.md"><i class="fa fa-pencil"></i> Improve this page</a>
|
288
|
-
</div>
|
289
|
-
<h1>Merging a Pull Request</h1>
|
290
|
-
<p class="note info"><strong>This guide is for maintainers.</strong> These special people have <strong>write access</strong> to one or more of Jekyll’s repositories and help merge the contributions of others. You may find what is written here interesting, but it’s definitely not for everyone.</p>
|
291
|
-
|
292
|
-
<h2 id="code-review">Code Review</h2>
|
293
|
-
|
294
|
-
<p>All pull requests should be subject to code review. Code review is a <a href="https://blog.fullstory.com/what-we-learned-from-google-code-reviews-arent-just-for-catching-bugs-b125a13aa292">foundational value</a> of good engineering teams. Besides providing validation of correctness, it promotes a sense of community and gives other maintainers understanding of all parts of the code base. In short, code review is crucial to a healthy open source project.</p>
|
295
|
-
|
296
|
-
<p><strong>Read our guide for <a href="../reviewing-a-pull-request">Reviewing a pull request</a> before merging.</strong> Notably, the change must have tests if for code, and at least two maintainers must give it an OK.</p>
|
297
|
-
|
298
|
-
<h2 id="merging">Merging</h2>
|
299
|
-
|
300
|
-
<p>We have <a href="https://github.com/jekyllbot">a helpful little bot</a> which we use to merge pull requests. We don’t use the GitHub.com interface for two reasons:</p>
|
301
|
-
|
302
|
-
<ol>
|
303
|
-
<li>You can’t modify anything on mobile (e.g. titles, labels)</li>
|
304
|
-
<li>Provide a consistent paper trail in the <code class="highlighter-rouge">History.markdown</code> file for each release</li>
|
305
|
-
</ol>
|
306
|
-
|
307
|
-
<p>To merge a pull request, leave a comment thanking the contributor, then add the special merge request:</p>
|
308
|
-
|
309
|
-
<div class="language-text highlighter-rouge"><div class="highlight"><pre class="highlight"><code>Thank you very much for your contribution. Folks like you make this project and community strong. :heart:
|
310
|
-
|
311
|
-
@jekyllbot: merge +dev
|
312
|
-
</code></pre></div></div>
|
313
|
-
|
314
|
-
<p>The merge request is made up of three things:</p>
|
315
|
-
|
316
|
-
<ol>
|
317
|
-
<li>
|
318
|
-
<code class="highlighter-rouge">@jekyllbot:</code> – this is the prefix our bot looks for when processing commands</li>
|
319
|
-
<li>
|
320
|
-
<code class="highlighter-rouge">merge</code> – the command</li>
|
321
|
-
<li>
|
322
|
-
<code class="highlighter-rouge">+dev</code> – the category to which the changes belong</li>
|
323
|
-
</ol>
|
324
|
-
|
325
|
-
<p>The categories match the H3’s in the history/changelog file, and they are:</p>
|
326
|
-
|
327
|
-
<ol>
|
328
|
-
<li>Major Enhancements (<code class="highlighter-rouge">+major</code>) – major updates or breaking changes to the code which necessitate a major version bump (v3 ~> v4)</li>
|
329
|
-
<li>Minor Enhancements (<code class="highlighter-rouge">+minor</code>) – minor updates (feature, enhancement) which necessitate a minor version bump (v3.1 ~> v3.2)</li>
|
330
|
-
<li>Bug Fixes (<code class="highlighter-rouge">+bug</code>) – corrections to code which do not change or add functionality, which necessitate a patch version bump (v3.1.0 ~> v3.1.1)</li>
|
331
|
-
<li>Documentation (<code class="highlighter-rouge">+doc</code>) - changes to the documentation found in <code class="highlighter-rouge">docs/_docs/</code>
|
332
|
-
</li>
|
333
|
-
<li>Site Enhancements (<code class="highlighter-rouge">+site</code>) – changes to the source of <a href="https://jekyllrb.com">https://jekyllrb.com</a> found in <code class="highlighter-rouge">docs/</code>
|
334
|
-
</li>
|
335
|
-
<li>Development Fixes (<code class="highlighter-rouge">+dev</code>) – changes which do not affect user-facing functionality or documentation, such as test fixes or bumping internal dependencies</li>
|
336
|
-
<li>Forward Ports (<code class="highlighter-rouge">+port</code>) — bug fixes applied to a previous version of Jekyll pulled onto <code class="highlighter-rouge">master</code>, e.g. cherry-picked commits from <code class="highlighter-rouge">3-1-stable</code> to <code class="highlighter-rouge">master</code>
|
337
|
-
</li>
|
338
|
-
</ol>
|
339
|
-
|
340
|
-
<p>Once <a href="https://github.com/jekyllbot" class="user-mention">@jekyllbot</a> has merged the pull request, you should see three things:</p>
|
341
|
-
|
342
|
-
<ol>
|
343
|
-
<li>A successful merge</li>
|
344
|
-
<li>Addition of labels for the necessary category if they aren’t already applied</li>
|
345
|
-
<li>A commit to the <code class="highlighter-rouge">History.markdown</code> file which adds a note about the change</li>
|
346
|
-
</ol>
|
347
|
-
|
348
|
-
<p>If you forget the category, that’s just fine. You can always go back and move the line to the proper category header later. The category is always necessary for <code class="highlighter-rouge">jekyll/jekyll</code>, but many plugins have too few changes to necessitate changelog categories.</p>
|
349
|
-
|
350
|
-
<h2 id="rejoice">Rejoice</h2>
|
351
|
-
|
352
|
-
<p>You did it! Thanks for being a maintainer for one of our official Jekyll projects. Your work means the world to our thousands of users who rely on Jekyll daily. <img class="emoji" title=":heart:" alt=":heart:" src="https://assets-cdn.github.com/images/icons/emoji/unicode/2764.png" height="20" width="20" align="absmiddle"></p>
|
353
|
-
|
354
|
-
|
355
|
-
|
356
|
-
|
357
|
-
|
358
|
-
|
359
|
-
|
360
|
-
|
361
|
-
|
362
|
-
|
363
|
-
|
364
|
-
|
365
|
-
|
366
|
-
|
367
|
-
|
368
|
-
|
369
|
-
|
370
|
-
|
371
|
-
|
372
|
-
|
373
|
-
|
374
|
-
|
375
|
-
|
376
|
-
|
377
|
-
|
378
|
-
|
379
|
-
|
380
|
-
|
381
|
-
|
382
|
-
|
383
|
-
|
384
|
-
|
385
|
-
|
386
|
-
|
387
|
-
|
388
|
-
|
389
|
-
|
390
|
-
|
391
|
-
|
392
|
-
|
393
|
-
|
394
|
-
|
395
|
-
|
396
|
-
|
397
|
-
|
398
|
-
|
399
|
-
|
400
|
-
|
401
|
-
|
402
|
-
|
403
|
-
|
404
|
-
|
405
|
-
|
406
|
-
|
407
|
-
|
408
|
-
|
409
|
-
|
410
|
-
|
411
|
-
|
412
|
-
|
413
|
-
|
414
|
-
|
415
|
-
|
416
|
-
|
417
|
-
|
418
|
-
|
419
|
-
|
420
|
-
|
421
|
-
|
422
|
-
|
423
|
-
|
424
|
-
|
425
|
-
|
426
|
-
|
427
|
-
|
428
|
-
|
429
|
-
|
430
|
-
|
431
|
-
|
432
|
-
|
433
|
-
|
434
|
-
|
435
|
-
|
436
|
-
|
437
|
-
|
438
|
-
|
439
|
-
|
440
|
-
|
441
|
-
|
442
|
-
|
443
|
-
|
444
|
-
|
445
|
-
|
446
|
-
|
447
|
-
|
448
|
-
|
449
|
-
|
450
|
-
|
451
|
-
|
452
|
-
|
453
|
-
|
454
|
-
|
455
|
-
|
456
|
-
|
457
|
-
|
458
|
-
|
459
|
-
|
460
|
-
|
461
|
-
|
462
|
-
|
463
|
-
|
464
|
-
|
465
|
-
|
466
|
-
|
467
|
-
|
468
|
-
</article>
|
469
|
-
</div>
|
470
|
-
|
471
|
-
<div class="unit one-fifth hide-on-mobiles">
|
472
|
-
<aside>
|
473
|
-
|
474
|
-
<h4>Getting Started</h4>
|
475
|
-
<ul>
|
476
|
-
|
477
|
-
|
478
|
-
|
479
|
-
<li class=""><a href="/docs/home/">Welcome</a></li>
|
480
|
-
|
481
|
-
|
482
|
-
|
483
|
-
<li class=""><a href="/docs/quickstart/">Quick-start guide</a></li>
|
484
|
-
|
485
|
-
|
486
|
-
|
487
|
-
<li class=""><a href="/docs/installation/">Installation</a></li>
|
488
|
-
|
489
|
-
|
490
|
-
|
491
|
-
<li class=""><a href="/docs/windows/">Jekyll on Windows</a></li>
|
492
|
-
|
493
|
-
|
494
|
-
|
495
|
-
<li class=""><a href="/docs/usage/">Basic Usage</a></li>
|
496
|
-
|
497
|
-
|
498
|
-
|
499
|
-
<li class=""><a href="/docs/structure/">Directory structure</a></li>
|
500
|
-
|
501
|
-
|
502
|
-
|
503
|
-
<li class=""><a href="/docs/configuration/">Configuration</a></li>
|
504
|
-
|
505
|
-
</ul>
|
506
|
-
|
507
|
-
|
508
|
-
<h4>Your Content</h4>
|
509
|
-
<ul>
|
510
|
-
|
511
|
-
|
512
|
-
|
513
|
-
<li class=""><a href="/docs/frontmatter/">Front Matter</a></li>
|
514
|
-
|
515
|
-
|
516
|
-
|
517
|
-
<li class=""><a href="/docs/posts/">Writing posts</a></li>
|
518
|
-
|
519
|
-
|
520
|
-
|
521
|
-
<li class=""><a href="/docs/drafts/">Working with drafts</a></li>
|
522
|
-
|
523
|
-
|
524
|
-
|
525
|
-
<li class=""><a href="/docs/pages/">Creating pages</a></li>
|
526
|
-
|
527
|
-
|
528
|
-
|
529
|
-
<li class=""><a href="/docs/static-files/">Static Files</a></li>
|
530
|
-
|
531
|
-
|
532
|
-
|
533
|
-
<li class=""><a href="/docs/variables/">Variables</a></li>
|
534
|
-
|
535
|
-
|
536
|
-
|
537
|
-
<li class=""><a href="/docs/collections/">Collections</a></li>
|
538
|
-
|
539
|
-
|
540
|
-
|
541
|
-
<li class=""><a href="/docs/datafiles/">Data Files</a></li>
|
542
|
-
|
543
|
-
|
544
|
-
|
545
|
-
<li class=""><a href="/docs/assets/">Assets</a></li>
|
546
|
-
|
547
|
-
|
548
|
-
|
549
|
-
<li class=""><a href="/docs/migrations/">Blog migrations</a></li>
|
550
|
-
|
551
|
-
</ul>
|
552
|
-
|
553
|
-
|
554
|
-
<h4>Customization</h4>
|
555
|
-
<ul>
|
556
|
-
|
557
|
-
|
558
|
-
|
559
|
-
<li class=""><a href="/docs/templates/">Templates</a></li>
|
560
|
-
|
561
|
-
|
562
|
-
|
563
|
-
<li class=""><a href="/docs/includes/">Includes</a></li>
|
564
|
-
|
565
|
-
|
566
|
-
|
567
|
-
<li class=""><a href="/docs/permalinks/">Permalinks</a></li>
|
568
|
-
|
569
|
-
|
570
|
-
|
571
|
-
<li class=""><a href="/docs/pagination/">Pagination</a></li>
|
572
|
-
|
573
|
-
|
574
|
-
|
575
|
-
<li class=""><a href="/docs/plugins/">Plugins</a></li>
|
576
|
-
|
577
|
-
|
578
|
-
|
579
|
-
<li class=""><a href="/docs/themes/">Themes</a></li>
|
580
|
-
|
581
|
-
|
582
|
-
|
583
|
-
<li class=""><a href="/docs/extras/">Extras</a></li>
|
584
|
-
|
585
|
-
</ul>
|
586
|
-
|
587
|
-
|
588
|
-
<h4>Deployment</h4>
|
589
|
-
<ul>
|
590
|
-
|
591
|
-
|
592
|
-
|
593
|
-
<li class=""><a href="/docs/github-pages/">GitHub Pages</a></li>
|
594
|
-
|
595
|
-
|
596
|
-
|
597
|
-
<li class=""><a href="/docs/deployment-methods/">Deployment methods</a></li>
|
598
|
-
|
599
|
-
|
600
|
-
|
601
|
-
<li class=""><a href="/docs/continuous-integration/">Continuous Integration</a></li>
|
602
|
-
|
603
|
-
</ul>
|
604
|
-
|
605
|
-
|
606
|
-
<h4>Miscellaneous</h4>
|
607
|
-
<ul>
|
608
|
-
|
609
|
-
|
610
|
-
|
611
|
-
<li class=""><a href="/docs/troubleshooting/">Troubleshooting</a></li>
|
612
|
-
|
613
|
-
|
614
|
-
|
615
|
-
<li class=""><a href="/docs/sites/">Sites using Jekyll</a></li>
|
616
|
-
|
617
|
-
|
618
|
-
|
619
|
-
<li class=""><a href="/docs/resources/">Resources</a></li>
|
620
|
-
|
621
|
-
|
622
|
-
|
623
|
-
<li class=""><a href="/docs/upgrading/0-to-2/">Upgrading from 0.x to 2.x</a></li>
|
624
|
-
|
625
|
-
|
626
|
-
|
627
|
-
<li class=""><a href="/docs/upgrading/2-to-3/">Upgrading from 2.x to 3.x</a></li>
|
628
|
-
|
629
|
-
</ul>
|
630
|
-
|
631
|
-
|
632
|
-
<h4>Meta</h4>
|
633
|
-
<ul>
|
634
|
-
|
635
|
-
|
636
|
-
|
637
|
-
<li class=""><a href="/docs/contributing/">Contributing</a></li>
|
638
|
-
|
639
|
-
|
640
|
-
|
641
|
-
<li class=""><a href="/docs/maintaining/">Maintaining Jekyll</a></li>
|
642
|
-
|
643
|
-
|
644
|
-
|
645
|
-
<li class=""><a href="/docs/conduct/">Code of Conduct</a></li>
|
646
|
-
|
647
|
-
|
648
|
-
|
649
|
-
<li class=""><a href="/docs/history/">History</a></li>
|
650
|
-
|
651
|
-
</ul>
|
652
|
-
|
653
|
-
|
654
|
-
</aside>
|
655
|
-
</div>
|
656
|
-
|
657
|
-
|
658
|
-
<div class="clear"></div>
|
659
|
-
|
660
|
-
</div>
|
661
|
-
</section>
|
662
|
-
|
663
|
-
|
664
|
-
<footer>
|
665
|
-
<div class="grid">
|
666
|
-
<div class="unit one-third center-on-mobiles">
|
667
|
-
<p>The contents of this website are <br>© 2017 under the terms of the <a href="https://github.com/jekyll/jekyll/blob/master/LICENSE">MIT License</a>.</p>
|
668
|
-
</div>
|
669
|
-
<div class="unit two-thirds align-right center-on-mobiles">
|
670
|
-
<p>
|
671
|
-
Proudly hosted by
|
672
|
-
<a href="https://github.com">
|
673
|
-
<img src="/img/footer-logo.png" width="100" height="30" alt="GitHub • Social coding">
|
674
|
-
</a>
|
675
|
-
</p>
|
676
|
-
</div>
|
677
|
-
</div>
|
678
|
-
</footer>
|
679
|
-
|
680
|
-
<script>
|
681
|
-
var anchorForId = function (id) {
|
682
|
-
var anchor = document.createElement("a");
|
683
|
-
anchor.className = "header-link";
|
684
|
-
anchor.href = "#" + id;
|
685
|
-
anchor.innerHTML = "<span class=\"sr-only\">Permalink</span><i class=\"fa fa-link\"></i>";
|
686
|
-
anchor.title = "Permalink";
|
687
|
-
return anchor;
|
688
|
-
};
|
689
|
-
|
690
|
-
var linkifyAnchors = function (level, containingElement) {
|
691
|
-
var headers = containingElement.getElementsByTagName("h" + level);
|
692
|
-
for (var h = 0; h < headers.length; h++) {
|
693
|
-
var header = headers[h];
|
694
|
-
|
695
|
-
if (typeof header.id !== "undefined" && header.id !== "") {
|
696
|
-
header.appendChild(anchorForId(header.id));
|
697
|
-
}
|
698
|
-
}
|
699
|
-
};
|
700
|
-
|
701
|
-
document.onreadystatechange = function () {
|
702
|
-
if (this.readyState === "complete") {
|
703
|
-
var contentBlock = document.getElementsByClassName("docs")[0] || document.getElementsByClassName("news")[0];
|
704
|
-
if (!contentBlock) {
|
705
|
-
return;
|
706
|
-
}
|
707
|
-
for (var level = 1; level <= 6; level++) {
|
708
|
-
linkifyAnchors(level, contentBlock);
|
709
|
-
}
|
710
|
-
}
|
711
|
-
};
|
712
|
-
</script>
|
713
|
-
|
714
|
-
|
715
|
-
<!-- Gauges (http://get.gaug.es/) -->
|
716
|
-
<script>
|
717
|
-
var _gauges = _gauges || [];
|
718
|
-
(function() {
|
719
|
-
var t = document.createElement('script');
|
720
|
-
t.type = 'text/javascript';
|
721
|
-
t.async = true;
|
722
|
-
t.id = 'gauges-tracker';
|
723
|
-
t.setAttribute('data-site-id', '503c5af6613f5d0f19000027');
|
724
|
-
t.src = '//secure.gaug.es/track.js';
|
725
|
-
var s = document.getElementsByTagName('script')[0];
|
726
|
-
s.parentNode.insertBefore(t, s);
|
727
|
-
})();
|
728
|
-
</script>
|
729
|
-
|
730
|
-
|
731
|
-
|
732
|
-
<!-- Google Analytics (https://www.google.com/analytics) -->
|
733
|
-
<script>
|
734
|
-
!function(j,e,k,y,l,L){j.GoogleAnalyticsObject=y,j[y]||(j[y]=function(){
|
735
|
-
(j[y].q=j[y].q||[]).push(arguments)}),j[y].l=+new Date,l=e.createElement(k),
|
736
|
-
L=e.getElementsByTagName(k)[0],l.src='//www.google-analytics.com/analytics.js',
|
737
|
-
L.parentNode.insertBefore(l,L)}(window,document,'script','ga');
|
738
|
-
|
739
|
-
ga('create', 'UA-50755011-1', 'jekyllrb.com');
|
740
|
-
ga('send', 'pageview');
|
741
|
-
|
742
|
-
</script>
|
743
|
-
|
744
|
-
|
745
|
-
|
746
|
-
</body>
|
747
|
-
</html>
|