Commit Graph

8527 Commits

Author SHA1 Message Date
jekyllbot
becdcb5164 Update history to reflect merge of #5765 [ci skip] 2017-01-15 03:47:06 -05:00
jekyllbot
057365a578 Merge pull request #5765 from jekyll/bump-rubocop
Merge pull request 5765
2017-01-15 03:47:05 -05:00
Frank Taillandier
6f8bf2e950 appease rubocop 2017-01-14 20:11:30 +01:00
Frank Taillandier
39b7af3732 exclude rake tasks and gemspec from metrics
exclude from BlockLength and LineLength metrics
2017-01-14 20:05:11 +01:00
Frank Taillandier
5d52074d2d appease Rubocop 2017-01-14 20:01:41 +01:00
Frank Taillandier
44324828b4 bump Rubocop to latest version 2017-01-14 20:00:36 +01:00
jekyllbot
7d5f961dba Update history to reflect merge of #5764 [ci skip] 2017-01-14 07:41:25 -05:00
jekyllbot
da6830f021 Merge pull request #5764 from purplecarrot/patch-1
Merge pull request 5764
2017-01-14 07:41:24 -05:00
Purplecarrot
59cbdf5935 Correct minor typo 2017-01-14 10:36:55 +00:00
jekyllbot
b9ae94387f Update history to reflect merge of #5750 [ci skip] 2017-01-14 00:01:33 -05:00
jekyllbot
aa63deb2a9 Merge pull request #5750 from jekyll/no-implicit-conversion-of-nil-to-string
Merge pull request 5750
2017-01-14 00:01:31 -05:00
jekyllbot
a66fd1fa04 Update history to reflect merge of #5758 [ci skip] 2017-01-13 04:59:14 -05:00
jekyllbot
b8957ab607 Merge pull request #5758 from BlueberryFoxtrot/patch-2
Merge pull request 5758
2017-01-13 04:59:12 -05:00
jekyllbot
27ed81547b Update history to reflect merge of #5761 [ci skip] 2017-01-12 16:41:16 -08:00
jekyllbot
76410d16d1 Merge pull request #5761 from jekyll/pull/consistent_comma
Merge pull request 5761
2017-01-12 16:41:15 -08:00
Pat Hawks
1d885911bc Rubocop: Require consistent comma in multiline literals 2017-01-12 17:52:29 -06:00
BlueberryFoxtrot
2fc4fdfe79 Update quickstart.md 2017-01-12 17:39:21 +01:00
jekyllbot
8ae2673eba Update history to reflect merge of #5744 [ci skip] 2017-01-11 09:13:39 -08:00
jekyllbot
9b71cf7556 Merge pull request #5744 from DirtyF/pull/docs-use-defaults
Merge pull request 5744
2017-01-11 09:13:38 -08:00
Parker Moore
02858fdf08 include: improve boolean logic in #valid_include_file? 2017-01-11 12:05:56 -05:00
jekyllbot
07d161c2ce Update history to reflect merge of #5752 [ci skip] 2017-01-11 01:42:10 -08:00
jekyllbot
fb450630ef Merge pull request #5752 from mpchadwick/jekyll-pre-commit
Merge pull request 5752
2017-01-11 01:42:08 -08:00
Max Chadwick
c198b08ee8 Add jekyll-pre-commit to plugins list 2017-01-10 22:50:30 -05:00
jekyllbot
4f84b522b5 Update history to reflect merge of #5621 [ci skip] 2017-01-10 12:05:59 -08:00
jekyllbot
bf33dc7f50 Merge pull request #5621 from rogerogden/patch-1
Merge pull request 5621
2017-01-10 12:05:58 -08:00
Parker Moore
22368896fb Rearrange some pieces of History.markdown. 2017-01-10 12:17:42 -05:00
Parker Moore
faa67bcd62 include: fix 'no implicit conversion of nil to String'
This is when either 'dir' or 'file' is nil.
2017-01-10 12:12:55 -05:00
jekyllbot
0210022c75 Update history to reflect merge of #5746 [ci skip] 2017-01-10 01:46:18 -08:00
jekyllbot
8a02606c09 Merge pull request #5746 from DirtyF/sort-gems
Merge pull request 5746
2017-01-10 01:46:17 -08:00
jekyllbot
f785d6f8d1 Update history to reflect merge of #5748 [ci skip] 2017-01-10 01:45:46 -08:00
jekyllbot
fe6d772b13 Merge pull request #5748 from yoostk/minor-fix
Merge pull request 5748
2017-01-10 01:45:44 -08:00
Frank Taillandier
c48daa9d5b normalize whitespace 2017-01-10 10:34:16 +01:00
yoostk
4ef69b948c Fix a minor grammatical mistake on themes' document 2017-01-10 15:03:46 +09:00
Frank Taillandier
6748f100d5 Merge branch 'master' into sort-gems 2017-01-09 23:14:21 +01:00
jekyllbot
47550935cb Update history to reflect merge of #5725 [ci skip] 2017-01-09 14:14:03 -08:00
jekyllbot
d2eb645386 Merge pull request #5725 from jekyll/pull/assert_nil
Merge pull request 5725
2017-01-09 14:14:01 -08:00
jekyllbot
fb83ebadf6 Update history to reflect merge of #5745 [ci skip] 2017-01-09 14:10:03 -08:00
jekyllbot
102ea9eed1 Merge pull request #5745 from DirtyF/rubocop-autocorrect
Merge pull request 5745
2017-01-09 14:10:02 -08:00
Frank Taillandier
335d9b3881 sort gems 2017-01-09 21:39:42 +01:00
Frank Taillandier
10b96b26bc Sort dependencies 2017-01-09 21:39:19 +01:00
Frank Taillandier
8bf9c37cf5 rubocop -a 2017-01-09 21:32:11 +01:00
Frank Taillandier
0c9c236c48 rubocup -a 2017-01-09 21:31:57 +01:00
Frank Taillandier
74e6ef83c9 Use defaults in config
All docs stored in _docs inherit from docs layout
All news items stored in _posts inherit from news-item layout
2017-01-09 21:10:24 +01:00
jekyllbot
86fc58491c Update history to reflect merge of #5473 [ci skip] 2017-01-09 06:36:52 -08:00
jekyllbot
1c4833c5ed Merge pull request #5473 from kentonh/patch-1
Merge pull request 5473
2017-01-09 06:36:51 -08:00
Frank Taillandier
e60769731a Report modifications to docs 2017-01-09 15:25:59 +01:00
Kenton Hansen
b1291605b3 Changes to 'bundle exec jekyll serve'
Updated to be consistent with the rest of documentation.
2017-01-09 15:19:46 +01:00
Kenton Hansen
8a5672fdff Addition of a sample "typical post"
So, I thought this section in the docs would be a good place to put the anatomy of a post .md file.
2017-01-09 15:19:46 +01:00
jekyllbot
74fe613072 Update history to reflect merge of #5740 [ci skip] 2017-01-09 05:16:12 -08:00
jekyllbot
45ad85b27d Merge pull request #5740 from KAndrsn/patch-1
Merge pull request 5740
2017-01-09 05:16:11 -08:00