Commit Graph

10983 Commits

Author SHA1 Message Date
Parker Moore
23808c2ae6 Fix missing trailing comma to alleviate fmt errors
Offenses:

test/test_static_file.rb:151:9: C: [Corrected] Style/TrailingCommaInLiteral: Put a comma after the last item of a multiline hash.
        "collection"    => nil
        ^^^^^^^^^^^^^^^^^^^^^^
2017-02-10 21:16:25 -05:00
Parker Moore
ec234a4ef8 Bump Ruby 2.1 testing up to Ruby 2.1.10 2017-02-10 21:14:07 -05:00
jekyllbot
bcebf58cbd Update history to reflect merge of #5860 [ci skip] 2017-02-10 21:10:11 -05:00
jekyllbot
afe6e3622c Merge pull request #5860 from ashmaroli/exclude-patch
Merge pull request 5860
2017-02-10 21:10:09 -05:00
jekyllbot
7b58bcfc9e Update history to reflect merge of #5871 [ci skip] 2017-02-10 21:08:50 -05:00
jekyllbot
7ea53e0a3f Merge pull request #5871 from jekyll/static-file-drop
Merge pull request 5871
2017-02-10 21:08:49 -05:00
jekyllbot
bdf594317b Update history to reflect merge of #5876 [ci skip] 2017-02-10 14:26:16 -05:00
jekyllbot
5b7cc78912 Merge pull request #5876 from marcanuy/master
Merge pull request 5876
2017-02-10 14:26:15 -05:00
Marcelo Canina
1d44be5421 fix ial css classes in theme doc 2017-02-10 12:34:16 -03:00
Ben Balter
229769e249 add StaticFileDrop 2017-02-08 17:44:47 -05:00
Tom Johnson
755cc6c137 Fixes based on latest review
Mostly I added more detail in the Liquid section.
2017-02-05 20:55:16 -08:00
Ashwin Maroli
3745b24564 update comment for exclude array 2017-02-05 07:55:26 +05:30
Ashwin Maroli
eb36ea095f test overriding default excludes 2017-02-05 01:56:49 +05:30
Ashwin Maroli
2813b9c039 test exclusion of Gemfile 2017-02-05 01:49:38 +05:30
Ashwin Maroli
6316856773 comment out 'exclude:' in config file 2017-02-05 01:28:43 +05:30
Ashwin Maroli
4e40593a53 exclude Gemfile and its lockfile by default 2017-02-05 01:26:41 +05:30
jekyllbot
20d2eb2709 Update history to reflect merge of #5858 [ci skip] 2017-02-04 12:30:28 -05:00
jekyllbot
d41e5e1fc0 Merge pull request #5858 from desiredpersona/patch-1
Merge pull request 5858
2017-02-04 12:30:27 -05:00
Colin
7e45610379 Add the correct year to the 3.4.0 release date 2017-02-04 15:52:42 +00:00
Tom Johnson
4b325a65af updated based on review
I moved the section about liquid and yaml to the end and shortened it. i also clarified that isn't an order-of-interpretation issue why liquid doesn't render in yaml. I also fixed the type with HMTL.
2017-02-03 20:46:05 -08:00
jekyllbot
0c59ac3d29 Update history to reflect merge of #5837 [ci skip] 2017-01-31 10:12:47 -05:00
jekyllbot
4924f3ba90 Merge pull request #5837 from natebass/add-termux-troubleshooting
Merge pull request 5837
2017-01-31 10:12:46 -05:00
jekyllbot
1457359ce5 Update history to reflect merge of #5842 [ci skip] 2017-01-31 10:10:36 -05:00
jekyllbot
6f8c208cb2 Merge pull request #5842 from alfredmyers/patch-1
Merge pull request 5842
2017-01-31 10:10:34 -05:00
Alfred Myers
e0109633de Corrected date for version 3.4.0
Year should probably be 2017 instead of 2016
2017-01-31 13:05:26 -02:00
jekyllbot
78a4f20744 Update history to reflect merge of #5835 [ci skip] 2017-01-31 03:50:10 -05:00
jekyllbot
759f4b3d93 Merge pull request #5835 from ashmaroli/rubocop-patch
Merge pull request 5835
2017-01-31 03:50:09 -05:00
Nate
875486e8ae Add Termux section on troubleshooting 2017-01-30 22:13:05 -08:00
Ashwin Maroli
384be58b5e add missing comma 2017-01-31 08:40:06 +05:30
Tom Johnson
a7cba8a8a6 Made updates as suggested by reviewers 2017-01-30 11:45:24 -08:00
Tom Johnson
8bacf01c1b Add documentation about order of interpretation
This tutorial defines Jekyll's "order of interpretation," as @swizca called it in [#5808](https://github.com/jekyll/jekyll/pull/5698). This tutorial makes it clear how Jekyll processes files as it renders the static HTML output.

This order-of-interpretation info is important for troubleshooting and generally understanding Jekyll. It's important to know how Jekyll generates out the files, what rules it uses, what order it processes things, and so forth.

(Note: Please process 5698 before this request, because 5698 includes the tutorial collection/navigation that this tutorial fits into. I also need to update this commit to add a link in the Tutorials nav to this topic, but I'm waiting for 5698 to be merged so that menu becomes available.)

@jekyll/documentation
@dirtyf
2017-01-29 21:45:03 -08:00
Ashwin Maroli
3da459ef33 update rubygems version on travis 2017-01-28 22:15:34 +05:30
ashmaroli
a1d98bec82 Merge branch 'master' into ruby-2.4.0 2017-01-28 15:27:49 +05:30
jekyllbot
f1e13041b5 Merge pull request #5827 from DirtyF/filters-links
Merge pull request 5827
2017-01-27 15:25:33 -05:00
Frank Taillandier
f6dffecab7 fix broken links in release post 2017-01-27 20:51:56 +01:00
jekyllbot
966800fb1f Update history to reflect merge of #5817 [ci skip] 2017-01-27 11:37:05 -05:00
jekyllbot
1ff59026f1 Merge pull request #5817 from DirtyF/pull/installation
Merge pull request 5817
2017-01-27 11:37:03 -05:00
jekyllbot
c01b7e4a4a Update history to reflect merge of #4362 [ci skip] 2017-01-27 11:10:55 -05:00
jekyllbot
2cf685feb2 Merge pull request #4362 from jekyll/liquid-4
Merge pull request 4362
2017-01-27 11:10:53 -05:00
Parker Moore
76feebd2d2 Release 💎 3.4.0 v3.4.0 2017-01-27 11:06:00 -05:00
Parker Moore
5183bde7b8 Update release date of 3.4.0 2017-01-27 11:05:55 -05:00
Parker Moore
eca4b94c3a Remove jona as contributor. 2017-01-26 16:26:39 -05:00
Parker Moore
6d34cf18fb New list of contributors 2017-01-26 16:24:53 -05:00
Parker Moore
7c1aae3e30 Update history on website to reflect new things merged 2017-01-26 16:24:45 -05:00
Parker Moore
d266354e42 Merge branch 'master' into release-3-4-0
* master: (39 commits)
  Update history to reflect merge of #5798 [ci skip]
  Update history to reflect merge of #5822 [ci skip]
  use logger.info
  run codeclimate after success
  Update history to reflect merge of #5819 [ci skip]
  Fixed inaccuracy in "Built-in permalink styles" docs [skip ci]
  Update history to reflect merge of #5802 [ci skip]
  Update history to reflect merge of #5811 [ci skip]
  Update history to reflect merge of #5690 [ci skip]
  Update history to reflect merge of #5815 [ci skip]
  Review CI pages
  Rework CI doc to include multiple providers.
  Update history to reflect merge of #5812 [ci skip]
  Add jekyll-ga plug-in
  Update configuration.md
  Add mention of classifier-reborn for LSI
  Update history to reflect merge of #5810 [ci skip]
  Got that diaper money?
  Added note about --blank flag
  Update history to reflect merge of #5797 [ci skip]
  ...
2017-01-26 16:15:07 -05:00
jekyllbot
f0dcc9415b Update history to reflect merge of #5798 [ci skip] 2017-01-26 15:53:46 -05:00
jekyllbot
17ccfdca4f Merge pull request #5798 from DirtyF/bump-codeclimate-test-reporter
Merge pull request 5798
2017-01-26 15:53:44 -05:00
jekyllbot
4a781f23f3 Update history to reflect merge of #5822 [ci skip] 2017-01-26 15:52:26 -05:00
jekyllbot
27482899e7 Merge pull request #5822 from joelmeyerhamme/patch-1
Merge pull request 5822
2017-01-26 15:52:24 -05:00
Joel Meyer-Hamme
4b19e93f09 use logger.info
Imo running `--lsi` should use `Jekyll.logger.info`, so it can be made `--quiet`.
2017-01-26 16:02:08 +00:00