Frank Taillandier
cd8836cf6e
bump htmlproofer
2017-01-17 02:34:15 +01:00
jekyllbot
e509cf2139
Update history to reflect merge of #5767 [ci skip]
2017-01-16 18:38:35 -05:00
jekyllbot
6c4699bd54
Merge pull request #5767 from Crunch09/issue-5756
...
Merge pull request 5767
2017-01-16 18:38:34 -05:00
jekyllbot
448b6ba08e
Update history to reflect merge of #5779 [ci skip]
2017-01-16 17:03:42 -05:00
jekyllbot
71dab94a97
Merge pull request #5779 from jekyll/fix-flaky-plugins-path-test
...
Merge pull request 5779
2017-01-16 17:03:41 -05:00
Parker Moore
aa7e47a30d
Remove calls to Dir.chdir without a block.
...
This removes the necessity to initialize Jekyll::Configuration::DEFAULTS manually.
2017-01-16 16:43:25 -05:00
Parker Moore
567a7952dd
test/helper: fix flaky plugin path test by initializing Configuration::DEFAULTS at start of tests
...
If we do a Dir.chdir before Configuration::DEFAULTS is initialized, then its source and destination values will not be what we expect.
We expect that Dir.pwd should stay as the root of the repo but there are some errant calls to Dir.chdir without a block that are still
not yet cleaned up.
2017-01-16 16:25:09 -05:00
jekyllbot
9d70bbba44
Update history to reflect merge of #5768 [ci skip]
2017-01-16 16:00:07 -05:00
jekyllbot
750fb32ca3
Merge pull request #5768 from DirtyF/rubocop-47
...
Merge pull request 5768
2017-01-16 16:00:06 -05:00
jekyllbot
036dd3ccc9
Update history to reflect merge of #5769 [ci skip]
2017-01-16 11:05:25 -05:00
jekyllbot
941e8f85dd
Merge pull request #5769 from diev/patch-1
...
Merge pull request 5769
2017-01-16 11:05:24 -05:00
Dmitrii Evdokimov
55993c6c5d
Fix a markdown link to look properly on the web
2017-01-16 17:53:04 +03:00
Frank Taillandier
d790477d6d
Add security rules
2017-01-16 10:43:07 +01:00
Frank Taillandier
a30d81ceb8
bump Rubocop to v47
2017-01-16 10:26:08 +01:00
Florian Thomas
ecd04badf0
throw IncludeTagError if error occurs in included file
...
fixes #5756
2017-01-15 20:35:10 +01:00
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
