Commit Graph

7769 Commits

Author SHA1 Message Date
jekyllbot
a7bc7ff9c7 Merge pull request #5188 from jekyll/default-site-read-from-local
Merge pull request 5188
2016-08-02 16:13:06 -07:00
Parker Moore
3943de066c script/default-site: read Jekyll source from local clone
If you bump the version in the repo, then it all goes haywire.
2016-08-02 15:55:33 -07:00
jekyllbot
6d2b344c0e Update history to reflect merge of #5178 [ci skip] 2016-08-01 22:06:56 -07:00
jekyllbot
88b57ce649 Merge pull request #5178 from jekyll/default-site-specify-gemfile
Merge pull request 5178
2016-08-01 22:06:55 -07:00
Parker Moore
663117403d script/default-site: specify BUNDLE_GEMFILE for new site 2016-08-01 21:56:28 -07:00
jekyllbot
c4483a3a29 Update history to reflect merge of #5168 [ci skip] 2016-08-01 17:36:40 -07:00
jekyllbot
896a502129 Merge pull request #5168 from jekyll/change-quickstart
Merge pull request 5168
2016-08-01 17:36:40 -07:00
jekyllbot
8408449551 Update history to reflect merge of #5164 [ci skip] 2016-08-01 17:34:52 -07:00
jekyllbot
6e0119d5e1 Merge pull request #5164 from jekyll/fix-windows-error
Merge pull request 5164
2016-08-01 17:34:52 -07:00
jekyllbot
b113c01198 Merge pull request #5169 from DirtyF/change-quickstart
Merge pull request 5169
2016-08-01 17:34:17 -07:00
jekyllbot
c6417e8c82 Update history to reflect merge of #5169 [ci skip] 2016-08-01 17:34:17 -07:00
jekyllbot
c6f2459b4e Update history to reflect merge of #5154 [ci skip] 2016-08-01 17:33:55 -07:00
jekyllbot
73b7bd8172 Merge pull request #5154 from jekyll/build-the-site
Merge pull request 5154
2016-08-01 17:33:54 -07:00
Parker Moore
28365aef96 Run the CI, please. 2016-08-01 17:28:52 -07:00
Parker Moore
52f5dc154c Merge branch 'master' into build-the-site
* master:
  Update history to reflect merge of #5156 [ci skip]
  Update history to reflect merge of #5177 [ci skip]
  Update history to reflect merge of #5173 [ci skip]
  Minor updates and corrections
  Future True on GitHub Pages note
  resolve theme root before sanitizing
  dont double sanitize theme folder paths
2016-08-01 17:28:19 -07:00
Parker Moore
dc8c6e0e43 Merge branch 'master' into build-the-site
* master:
  Update history to reflect merge of #5152 [ci skip]
  Missing trailing |
  Update history to reflect merge of #5158 [ci skip]
  Also include LICENSE and README
  note that themes have been released
  Update history to reflect merge of #5143 [ci skip]
  Update history to reflect merge of #5150 [ci skip]
  Revert "Readability: lib/jekyll/static_file.rb."
  include theme directories in default gemspec
  [site] enable excerpts
  Centre align text and use nav styles on helpful links.
  Puns FTW
  Add helpful links and minor alignment tweak.
  Create error template that has no main nav or footer.
  Use more generic wording.
  sitemap: false so that the error page is not indexed
  Initial 404 page
2016-08-01 17:28:05 -07:00
jekyllbot
8540487997 Update history to reflect merge of #5156 [ci skip] 2016-08-01 17:27:02 -07:00
jekyllbot
95e9774100 Merge pull request #5156 from jekyll/theme-source-fix
Merge pull request 5156
2016-08-01 17:27:02 -07:00
jekyllbot
e735e45156 Update history to reflect merge of #5177 [ci skip] 2016-08-01 17:25:44 -07:00
jekyllbot
ae72c64441 Merge pull request #5177 from gep13/patch-1
Merge pull request 5177
2016-08-01 17:25:43 -07:00
Parker Moore
4d0d528fd5 script/default-site: give debug output 2016-08-01 14:49:52 -07:00
jekyllbot
26b827a536 Update history to reflect merge of #5173 [ci skip] 2016-08-01 13:14:07 -07:00
jekyllbot
1374a6c84c Merge pull request #5173 from danayel/patch-1
Merge pull request 5173
2016-08-01 13:14:06 -07:00
Gary Ewan Park
c5bd075bc7 Minor updates and corrections
- Corrected highlighting on multi-line sections
- Replace `cinst` with `choco install` for consistency
2016-08-01 19:20:59 +01:00
Ben Balter
4dab0c7da6 Only build default site once 2016-08-01 13:10:23 -04:00
Daniel Chapman
65d1dc48f3 Future True on GitHub Pages note 2016-08-01 11:05:12 +09:00
DirtyF
207b6f19f0 update instructions to require bundler 2016-07-30 18:22:51 +02:00
Parker Moore
9d45644e6c docs/quickstart: update instructions to require bundler
With gem-based themes being bundled in the new site via the `Gemfile`, we
should ask folks to use Bundler wherever possible. This should lead to more
successful installations and getting the base site setup properly.

The only trouble this introduces is it puts a dependency on Bundler. That
said, I'm totally fine with requiring everyone use Bundler for this site.
How could we best install bundler in these instructions?

/cc @jekyll/documentation
2016-07-30 11:35:06 -04:00
Parker Moore
d4e18fc979 Layout: set relative_path without using Pathname
Presently, on a Windows machine, you get an ArgumentError on Windows:

     Generating...
C:/Ruby23-x64/lib/ruby/2.3.0/pathname.rb:520:in `relative_path_from':
    different prefix: "/" and "C:/Ruby23-x64/lib/ruby/gems/2.3.0/gems/minima-1.0.1" (ArgumentError)
    from C:/Ruby23-x64/lib/ruby/gems/2.3.0/gems/jekyll-3.2.0/lib/jekyll/layout.rb:61:in `relative_path'
    from C:/Ruby23-x64/lib/ruby/gems/2.3.0/gems/jekyll-3.2.0/lib/jekyll/renderer.rb:161:in `place_in_layouts'
    from C:/Ruby23-x64/lib/ruby/gems/2.3.0/gems/jekyll-3.2.0/lib/jekyll/renderer.rb:71:in `run'

This doesn't affect filesystems which do not use drive names.
2016-07-29 12:16:06 -07:00
jekyllbot
3b2bbcb70f Update history to reflect merge of #5152 [ci skip] 2016-07-28 14:02:11 -07:00
jekyllbot
8e25b8bffb Merge pull request #5152 from jekyll/theme-dir-regex-fix
Merge pull request 5152
2016-07-28 14:02:10 -07:00
Ben Balter
909800839c Missing trailing | 2016-07-28 16:31:20 -04:00
jekyllbot
27cfa00a43 Update history to reflect merge of #5158 [ci skip] 2016-07-28 13:22:20 -07:00
jekyllbot
ff80d2f2b5 Merge pull request #5158 from jekyll/release-the-themes
Merge pull request 5158
2016-07-28 13:22:19 -07:00
Ben Balter
9220c5a634 Also include LICENSE and README 2016-07-28 15:43:45 -04:00
Ben Balter
b22fa7ce4e note that themes have been released 2016-07-28 15:39:41 -04:00
Ben Balter
8b69c6f0b5 resolve theme root before sanitizing 2016-07-28 15:12:31 -04:00
jekyllbot
94af8ca75a Update history to reflect merge of #5143 [ci skip] 2016-07-28 11:58:26 -07:00
jekyllbot
f29ebc4911 Merge pull request #5143 from adampetrie/jekyllrb-404
Merge pull request 5143
2016-07-28 11:58:26 -07:00
jekyllbot
16ff4c12bb Update history to reflect merge of #5150 [ci skip] 2016-07-28 11:57:21 -07:00
jekyllbot
e01f1ece48 Merge pull request #5150 from jekyll/add-excerpts
Merge pull request 5150
2016-07-28 11:57:20 -07:00
Ben Balter
2351ef6bbe dont double sanitize theme folder paths 2016-07-28 14:46:05 -04:00
Ben Balter
bd96ca4ab6 bundle install before running bundle exec 2016-07-28 14:15:48 -04:00
Jordon Bedwell
54281530fb Revert "Readability: lib/jekyll/static_file.rb."
This reverts commit 26f1ea2487.
2016-07-28 13:15:29 -05:00
Ben Balter
4278f856ef add default site test to travis 2016-07-28 10:50:45 -04:00
Ben Balter
ca03a41564 add test to build the default site 2016-07-28 10:43:46 -04:00
Ben Balter
1bf47ec394 include theme directories in default gemspec 2016-07-28 10:21:30 -04:00
Ben Balter
6292476482 [site] enable excerpts 2016-07-28 09:52:30 -04:00
Jordon Bedwell
26f1ea2487 Readability: lib/jekyll/static_file.rb. 2016-07-27 23:59:50 -05:00
Parker Moore
dd82c72e14 New latest version for Jekyll. 2016-07-27 18:40:28 -07:00