3a7cbadd82
Merge pull request #5375 from Nicop06/underscore_highlight
...
Merge pull request 5375
2016-09-20 17:05:49 -07:00
f3859384c0
Update history to reflect merge of #5376 [ci skip]
2016-09-20 17:04:58 -07:00
ee84a95a38
Merge pull request #5376 from jonblatho/master
...
Merge pull request 5376
2016-09-20 17:04:57 -07:00
9ae0a7023b
Move reference to #5380 .
2016-09-20 17:04:26 -07:00
1ac87eaae2
Update history to reflect merge of #5380 [ci skip]
2016-09-20 16:39:33 -07:00
cfe61771e0
Merge pull request #5380 from ethomson/coderay_deprecation
...
Merge pull request 5380
2016-09-20 16:39:33 -07:00
262be85c49
Update history to reflect merge of #5237 [ci skip]
2016-09-20 15:32:26 -07:00
504411e476
Merge pull request #5237 from ashmaroli/bundle2new
...
Merge pull request 5237
2016-09-20 15:32:25 -07:00
650a3c7932
Update history to reflect merge of #5369
2016-09-20 13:48:40 -07:00
ad0f329d1c
Merge pull request #5369 from MertcanGokgoz/patch-1
...
Merge pull request 5369
2016-09-20 13:44:51 -07:00
152fa877f6
Update history to reflect merge of #5364 [ci skip]
2016-09-20 13:40:11 -07:00
3a45bf7d26
Merge pull request #5364 from jekyll/themes-asset-folder
...
Merge pull request 5364
2016-09-20 13:40:11 -07:00
279f1516d2
Merge branch 'master' into themes-asset-folder
...
* master:
Update history to reflect merge of #5381 [ci skip]
Update history to reflect merge of #5383 [ci skip]
run features on windows
Appease Rubocop
Update history to reflect merge of #5372 [ci skip]
Add missing period to sentence in first paragraph.
2016-09-20 13:13:01 -07:00
29d8fee4ce
Add test to ensure that the /assets theme reader doesn't clobber preexisting site files.
2016-09-20 13:12:34 -07:00
950a37395f
Update history to reflect merge of #5381 [ci skip]
2016-09-20 13:10:49 -07:00
d8d42f6abc
Merge pull request #5381 from pathawks/pr/rubocop
...
Merge pull request 5381
2016-09-20 13:10:48 -07:00
92dbe313e9
Update history to reflect merge of #5383 [ci skip]
2016-09-20 09:26:40 -07:00
2eedf7d79c
Merge pull request #5383 from ashmaroli/ruby-cucumber
...
Merge pull request 5383
2016-09-20 09:26:39 -07:00
75d59911ae
run features on windows
2016-09-20 10:28:54 +05:30
b78827cecb
Add documentation for assets.
2016-09-19 13:57:36 -07:00
7309ecf8e1
Theme: for various path helpers, use strings. Symbols confuse people.
2016-09-19 13:47:51 -07:00
3bfdc00d14
Appease Rubocop
2016-09-19 13:15:02 -05:00
f2bfc832a0
Marking filename with backticks as suggested
2016-09-19 12:08:20 -05:00
054b23f69a
Only complain about `coderay` if it is actually in the config
...
Don't complain about the deprecated `kramdown.coderay` key when
`highlighter == "coderay"`, since that could have been set with the
legitimate `syntax_highlighter: coderay` setting. Instead, complain
only if the `kramdown.coderay` configuration setting is actually
present.
2016-09-19 11:38:05 -05:00
0b94cf3fa1
Allow underscore in highlighter language
2016-09-19 13:10:29 +02:00
1a11536a2c
Clarify documentation in README
...
This change is subtle, but may prove greatly useful to Jekyll newbies
2016-09-18 17:38:28 -05:00
74baeb889a
ThemeAssetsReader: fix tests so everything passes.
2016-09-18 15:04:15 -04:00
7a9427ccec
Update history to reflect merge of #5372 [ci skip]
2016-09-18 10:54:26 -07:00
5a1c5311f3
Merge pull request #5372 from kyleobrien/patch-1
...
Merge pull request 5372
2016-09-18 10:54:26 -07:00
9aea71137e
Add missing period to sentence in first paragraph.
...
Added a period to the end of the last sentence in the first paragraph, which was missing.
2016-09-18 09:51:33 -04:00
5a932c90b5
added jekyll-spotify plugin
2016-09-18 10:50:21 +03:00
6d7f305e7c
Add tests for assets directory support.
2016-09-16 16:04:35 -07:00
cf26bf5db0
TestTheme: update tests for 'path_for' now that it's no longer prepending the underscore
2016-09-16 15:36:33 -07:00
87b9cfe2b5
ThemeBuilder: add 'assets' to list of scaffold directories
2016-09-16 14:57:58 -07:00
13aec48137
Add ThemeAssetsReader which reads assets from a theme
...
If the theme includes the 'assets' directory, it will be walked and items will be added to the site based
on the normal rules of Jekyll: if there is YAML front matter, it will be added as a (convertible) Page,
otherwise it will be added as a StaticFile.
2016-09-16 14:41:36 -07:00
b8f17b9034
Exclude node_modules by default
...
If no 'exclude' directive is specified, exclude node_modules by default.
https://twitter.com/mxstbr/status/761856359579185153
2016-09-16 13:09:10 -07:00
562ffe7a3f
Update history to reflect merge of #5361 [ci skip]
2016-09-16 12:58:42 -07:00
c877d6f75c
Merge pull request #5361 from DirtyF/patch-1
...
Merge pull request 5361
2016-09-16 12:58:42 -07:00
0233d93352
vendor is now excluded by default [ci-skip]
2016-09-16 18:25:06 +02:00
59b61c3f9f
Exclude vendor by default
2016-09-16 07:56:37 +02:00
57fd5f887d
Update history to reflect merge of #5199 [ci skip]
2016-09-13 07:11:51 -07:00
4888b84b44
Merge pull request #5199 from jeffkole/adds-linking-to-all-files
...
Merge pull request 5199
2016-09-13 07:11:50 -07:00
345f043cc4
test bundle install and skipping it.
2016-09-13 08:52:54 +05:30
566b42b8b3
add `bundle install` to `jekyll new`
...
- automatically run `bundle install` from within the newly generated blog
directory by default.
- add a new switch to skip this default behaviour.
2016-09-13 08:43:13 +05:30
55de780520
Update history to reflect merge of #5347 [ci skip]
2016-09-12 00:26:00 -07:00
42725b1325
Merge pull request #5347 from vohedge/patch-1
...
Merge pull request 5347
2016-09-12 00:26:00 -07:00
d86a293d78
Fix typo
2016-09-11 00:18:02 +09:00
a2e911c1b5
Update history to reflect merge of #5326 [ci skip]
2016-09-09 13:53:28 -07:00
3e0363be4a
Merge pull request #5326 from ashmaroli/gitignore-gem
...
Merge pull request 5326
2016-09-09 13:53:28 -07:00
aa2cfc81b7
Update history to reflect merge of #5337 [ci skip]
2016-09-08 11:27:36 -07:00
jekyllbot
jekyllbot
Parker Moore
Ashwin Maroli
Pat Hawks
Jonathan Thornton
Edward Thomson
Nicolas Porcel
Kyle O'Brien
Mertcan GÖKGÖZ
Frank Taillandier
vohedge