16d71b1f4b
Merge pull request #5691 from tomjohnson1492/patch-5
...
Merge pull request 5691
2017-01-16 21:38:55 -05:00
c39414a17b
use latest jemoji gem
2017-01-17 02:59:57 +01:00
cd8836cf6e
bump htmlproofer
2017-01-17 02:34:15 +01:00
9a5307c3f9
Don't include the theme's includes_path if it is nil.
2017-01-16 19:17:45 -05:00
e509cf2139
Update history to reflect merge of #5767 [ci skip]
2017-01-16 18:38:35 -05:00
6c4699bd54
Merge pull request #5767 from Crunch09/issue-5756
...
Merge pull request 5767
2017-01-16 18:38:34 -05:00
448b6ba08e
Update history to reflect merge of #5779 [ci skip]
2017-01-16 17:03:42 -05:00
71dab94a97
Merge pull request #5779 from jekyll/fix-flaky-plugins-path-test
...
Merge pull request 5779
2017-01-16 17:03:41 -05:00
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
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
9d70bbba44
Update history to reflect merge of #5768 [ci skip]
2017-01-16 16:00:07 -05:00
750fb32ca3
Merge pull request #5768 from DirtyF/rubocop-47
...
Merge pull request 5768
2017-01-16 16:00:06 -05:00
036dd3ccc9
Update history to reflect merge of #5769 [ci skip]
2017-01-16 11:05:25 -05:00
941e8f85dd
Merge pull request #5769 from diev/patch-1
...
Merge pull request 5769
2017-01-16 11:05:24 -05:00
55993c6c5d
Fix a markdown link to look properly on the web
2017-01-16 17:53:04 +03:00
d790477d6d
Add security rules
2017-01-16 10:43:07 +01:00
a30d81ceb8
bump Rubocop to v47
2017-01-16 10:26:08 +01:00
ecd04badf0
throw IncludeTagError if error occurs in included file
...
fixes #5756
2017-01-15 20:35:10 +01:00
becdcb5164
Update history to reflect merge of #5765 [ci skip]
2017-01-15 03:47:06 -05:00
057365a578
Merge pull request #5765 from jekyll/bump-rubocop
...
Merge pull request 5765
2017-01-15 03:47:05 -05:00
6f8bf2e950
appease rubocop
2017-01-14 20:11:30 +01:00
39b7af3732
exclude rake tasks and gemspec from metrics
...
exclude from BlockLength and LineLength metrics
2017-01-14 20:05:11 +01:00
5d52074d2d
appease Rubocop
2017-01-14 20:01:41 +01:00
44324828b4
bump Rubocop to latest version
2017-01-14 20:00:36 +01:00
7d5f961dba
Update history to reflect merge of #5764 [ci skip]
2017-01-14 07:41:25 -05:00
da6830f021
Merge pull request #5764 from purplecarrot/patch-1
...
Merge pull request 5764
2017-01-14 07:41:24 -05:00
59cbdf5935
Correct minor typo
2017-01-14 10:36:55 +00:00
b9ae94387f
Update history to reflect merge of #5750 [ci skip]
2017-01-14 00:01:33 -05:00
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
a66fd1fa04
Update history to reflect merge of #5758 [ci skip]
2017-01-13 04:59:14 -05:00
b8957ab607
Merge pull request #5758 from BlueberryFoxtrot/patch-2
...
Merge pull request 5758
2017-01-13 04:59:12 -05:00
6d9633e364
making edits from reviews
2017-01-12 23:28:56 -08:00
7efeb3d4af
made updates as requested from latest review
2017-01-12 23:03:56 -08:00
27ed81547b
Update history to reflect merge of #5761 [ci skip]
2017-01-12 16:41:16 -08:00
76410d16d1
Merge pull request #5761 from jekyll/pull/consistent_comma
...
Merge pull request 5761
2017-01-12 16:41:15 -08:00
1d885911bc
Rubocop: Require consistent comma in multiline literals
2017-01-12 17:52:29 -06:00
2fc4fdfe79
Update quickstart.md
2017-01-12 17:39:21 +01:00
335c8fcf62
Update installation.md
...
1. Addition of *Running Jekyll on Ubuntu* section, to address Ubuntu stumbling block as per https://github.com/jekyll/jekyll/issues/5719 .
2. Restructuring, and I hope I understood correctly when NodeJS/Python are/aren't required.
3. Gentler wording – it's probably not a good idea to tell punters who hit this page because they ran into trouble that installing Jekyll *is* easy and straight-forward; it *ought to be* straight-forward. (There's always the potential for pain and confusion if not all dependencies are in place.)
2017-01-12 17:28:32 +01:00
538cff15e9
report @parkr feedback
2017-01-11 20:57:34 +01:00
8ae2673eba
Update history to reflect merge of #5744 [ci skip]
2017-01-11 09:13:39 -08:00
9b71cf7556
Merge pull request #5744 from DirtyF/pull/docs-use-defaults
...
Merge pull request 5744
2017-01-11 09:13:38 -08:00
02858fdf08
include: improve boolean logic in #valid_include_file?
2017-01-11 12:05:56 -05:00
d77ed5e608
Add missing merge labels for jekyllbot
2017-01-11 10:49:21 +01:00
07d161c2ce
Update history to reflect merge of #5752 [ci skip]
2017-01-11 01:42:10 -08:00
fb450630ef
Merge pull request #5752 from mpchadwick/jekyll-pre-commit
...
Merge pull request 5752
2017-01-11 01:42:08 -08:00
c198b08ee8
Add jekyll-pre-commit to plugins list
2017-01-10 22:50:30 -05:00
4f84b522b5
Update history to reflect merge of #5621 [ci skip]
2017-01-10 12:05:59 -08:00
bf33dc7f50
Merge pull request #5621 from rogerogden/patch-1
...
Merge pull request 5621
2017-01-10 12:05:58 -08:00
31178bfe69
Merge branch 'master' into liquid-4
2017-01-10 20:01:04 +01:00
22368896fb
Rearrange some pieces of History.markdown.
2017-01-10 12:17:42 -05:00
jekyllbot
Frank Taillandier
Parker Moore
jekyllbot
Dmitrii Evdokimov
Florian Thomas
Purplecarrot
Tom Johnson
Pat Hawks
BlueberryFoxtrot
Max Chadwick