Marcus Stollsteimer
1c0f21230d
Stringify configuration overrides before first use
...
This makes sure that overrides for Jekyll.configuration
all have string keys before their first use, particularly
also the "config" and "skip_config_files" options.
2016-07-08 15:47:26 +02:00
jekyllbot
f6dc749332
Update history to reflect merge of #5063 [ci skip]
2016-07-07 15:42:31 -07:00
jekyllbot
09f3e46945
Merge pull request #5063 from ayastreb/extract-tag-name
...
Merge pull request 5063
2016-07-07 15:42:30 -07:00
Parker Moore
1a934125d9
Check for Ruby first, then JRuby
2016-07-07 13:37:25 -07:00
jekyllbot
5a339cc735
Update history to reflect merge of #5065 [ci skip]
2016-07-07 08:12:05 -07:00
jekyllbot
8bc104969f
Merge pull request #5065 from stomar/fix-test
...
Merge pull request 5065
2016-07-07 08:12:03 -07:00
Marcus Stollsteimer
d4c87e3655
Remove useless statement from test
2016-07-07 15:30:59 +02:00
Anatoliy Yastreb
ba08e17204
Extract tag name to class method
2016-07-07 14:41:57 +03:00
jekyllbot
25bff0075c
Update history to reflect merge of #5056 [ci skip]
2016-07-06 19:34:58 -07:00
jekyllbot
08b279cbdd
Merge pull request #5056 from ayastreb/drop-fetch
...
Merge pull request 5056
2016-07-06 19:34:56 -07:00
jekyllbot
a25e97b5fb
Update history to reflect merge of #5058 [ci skip]
2016-07-06 17:46:35 -07:00
jekyllbot
3a8e28cba1
Merge pull request #5058 from synthecypher/patch-2
...
Merge pull request 5058
2016-07-06 17:46:35 -07:00
Joshua Barnett
c698e83eb1
Highlight help nav item when navigated to.
2016-07-06 12:00:19 +01:00
Anatoliy Yastreb
3aead1d4a9
Imitate fetch method instead of creating real Hash object
2016-07-06 11:20:37 +03:00
Anatoliy Yastreb
72d49490d2
Add fetch method to Drops
2016-07-05 21:22:24 +03:00
jekyllbot
51a80b8225
Update history to reflect merge of #5054 [ci skip]
2016-07-05 10:19:29 -07:00
jekyllbot
bfaa80e41c
Merge pull request #5054 from andrewmunsell/patch-1
...
Merge pull request 5054
2016-07-05 10:19:28 -07:00
Andrew Munsell
ac552cd4e4
Add Formingo to the list of Jekyll form SaaS
...
Formingo (https://www.formingo.co ) is a new service I'm working on that handles form processing for static websites, such as those generated through Jekyll. Adding it to the list of form services because I believe it'd be a helpful resource and alternative to some of the other listed services.
2016-07-04 16:15:48 -07:00
jekyllbot
2f8c0ffc5d
Update history to reflect merge of #5043 [ci skip]
2016-06-30 10:37:16 -07:00
jekyllbot
5688266d54
Merge pull request #5043 from alexivkin/master
...
Merge pull request 5043
2016-06-30 10:37:15 -07:00
Alex Ivkin
c261730799
Art gallery generator plugin added
2016-06-29 21:30:42 -07:00
jekyllbot
70aa8a4e37
Update history to reflect merge of #5015 [ci skip]
2016-06-29 12:18:41 -07:00
jekyllbot
325b4c88d5
Merge pull request #5015 from jekyll/remove-jruby-and-ruby-head
...
Merge pull request 5015
2016-06-29 12:18:40 -07:00
Parker Moore
a072e9d25f
Ping our Travis overlords.
2016-06-29 00:55:11 -07:00
Parker Moore
b772329c60
Merge branch 'master' into remove-jruby-and-ruby-head
...
* master: (41 commits)
Fix rubocop offenses on master.
script/fmt: print Rubocop version
Update history to reflect merge of #5030 [ci skip]
rubocop: separate deprecator error messages
Update history to reflect merge of #5031 [ci skip]
Update history to reflect merge of #5032 [ci skip]
rubocop: fix code style
rubocop: fix code style
rubocop: fix code style
Update history to reflect merge of #5024 [ci skip]
Update history to reflect merge of #5025 [ci skip]
utils: check that the object is a hash when merging default_proc
Update history to reflect merge of #5026 [ci skip]
rubocop: refactor modified? method
Add a benchmark for capture vs. assign in Liquid. [ci skip]
Update history to reflect merge of #5027 [ci skip]
Add generator-jekyllized to third party plugins
rubocop: fix code style
rubocop: fix code style
rubocop: fix code style
...
2016-06-29 00:52:58 -07:00
Parker Moore
a7d25ed963
Fix rubocop offenses on master.
2016-06-28 22:08:06 -07:00
Parker Moore
6f3c01ca87
Fix for jruby
2016-06-28 18:30:02 -07:00
Parker Moore
2ef70fd348
Some weird stuff with Colorator on my machine & jruby.
2016-06-28 14:39:06 -07:00
Parker Moore
89c6b0ec0d
travis: do not run 'bundle update' any longer.
2016-06-28 12:43:34 -07:00
Parker Moore
12c1ada0e5
test: skip openssl test for jruby
2016-06-28 12:43:15 -07:00
Parker Moore
3a76ddf7a2
script/fmt: print Rubocop version
2016-06-28 12:38:46 -07:00
jekyllbot
18a8b4dcc7
Update history to reflect merge of #5030 [ci skip]
2016-06-27 09:48:48 -07:00
jekyllbot
549371fd4e
Merge pull request #5030 from ayastreb/document-stylefix
...
Merge pull request 5030
2016-06-27 09:48:46 -07:00
Anatoliy Yastreb
8154eb40aa
rubocop: separate deprecator error messages
2016-06-26 16:43:56 +02:00
jekyllbot
390c98045c
Update history to reflect merge of #5031 [ci skip]
2016-06-25 14:47:30 -07:00
jekyllbot
cdee574782
Merge pull request #5031 from ayastreb/convertible-stylefix
...
Merge pull request 5031
2016-06-25 14:47:29 -07:00
jekyllbot
6ddd64d4c4
Update history to reflect merge of #5032 [ci skip]
2016-06-25 14:46:32 -07:00
jekyllbot
1c71b5939f
Merge pull request #5032 from ayastreb/renderer-stylefix
...
Merge pull request 5032
2016-06-25 14:46:32 -07:00
Anatoliy Yastreb
3ccc91430f
rubocop: fix code style
2016-06-25 15:22:36 +03:00
Anatoliy Yastreb
2bbad7cb43
rubocop: fix code style
2016-06-25 15:11:50 +03:00
Anatoliy Yastreb
b156aa912a
rubocop: fix code style
2016-06-25 14:56:12 +03:00
Parker Moore
6f5ad2530e
Only run tests with --profile when using MRI.
2016-06-23 19:08:53 -07:00
Parker Moore
aeca7a195e
Run the unit tests in jruby.
2016-06-23 19:00:29 -07:00
jekyllbot
6dd3cc21c4
Update history to reflect merge of #5024 [ci skip]
2016-06-23 18:48:25 -07:00
jekyllbot
205acb0916
Merge pull request #5024 from ayastreb/configuration
...
Merge pull request 5024
2016-06-23 18:48:25 -07:00
jekyllbot
5312e85478
Update history to reflect merge of #5025 [ci skip]
2016-06-23 09:32:14 -07:00
jekyllbot
d093c76d35
Merge pull request #5025 from ayastreb/regenerator
...
Merge pull request 5025
2016-06-23 09:32:13 -07:00
Parker Moore
9278eb8fce
utils: check that the object is a hash when merging default_proc
...
Follow-up to #5026 .
2016-06-22 12:15:07 -07:00
jekyllbot
357e3621e2
Update history to reflect merge of #5026 [ci skip]
2016-06-22 10:05:59 -07:00
jekyllbot
6358a8f92c
Merge pull request #5026 from ayastreb/utils
...
Merge pull request 5026
2016-06-22 10:05:59 -07:00
