2b8de59717
remove merge conflict
2016-01-22 09:38:34 -08:00
afff4f0bec
Merge remote-tracking branch 'origin/pull/cleanup-document__post_read' into pull/cleanup-document__post_read
...
* origin/pull/cleanup-document__post_read:
add Utils.strip_heredoc
Fix #4191 : Reduce Document#post_read complexity slightly.
Fix #4188 : Extract title from filename successfully when dateless.
2016-01-22 09:37:58 -08:00
5878acaaf1
Document#post_read: only overwrite slug & ext if they aren't set by YAML
2016-01-22 09:36:55 -08:00
6c40c7f553
collections.feature: check for 0 exit status always
2016-01-22 09:36:37 -08:00
ba1cfab73c
step_definitions: fixture collections should copy _thanksgiving
2016-01-22 09:36:25 -08:00
8204e479c3
add Utils.strip_heredoc
2016-01-22 09:11:56 -08:00
67f842546e
Fix #4191 : Reduce Document#post_read complexity slightly.
2016-01-22 09:11:56 -08:00
1298ba6908
Fix #4188 : Extract title from filename successfully when dateless.
2016-01-22 09:09:30 -08:00
c0e0159783
Update history to reflect merge of #4389 [ci skip]
2016-01-22 09:03:44 -08:00
c42d27e428
Merge pull request #4389 from zsyed91/refactor_page_permalink
...
Merge pull request 4389
2016-01-22 09:03:43 -08:00
95df351341
Update history to reflect merge of #4390 [ci skip]
2016-01-22 09:01:21 -08:00
cbe66193c2
Merge pull request #4390 from contentful/contentful/add-contentful-to-docs
...
Merge pull request 4390
2016-01-22 09:01:20 -08:00
cf51e32d0e
Drop#[]: use self.class.invokable? instead of content_methods.include? for speed
2016-01-22 08:59:48 -08:00
442074fdb1
Add Contentful Extension to Plugins
2016-01-22 13:29:31 -03:00
4ecdf6ce10
Remove extra OR condition since a missing hash key will return a nil anyway. Added a test to catch this nil condition since it was missing to begin with. Reduced line length in test_page.rb
2016-01-21 23:44:30 -06:00
31ae61b419
Drop#[]: only use public_send for keys in the content_methods array
2016-01-21 18:20:35 -08:00
b3ddd985a4
Merge pull request #4380 from jekyll/cherry-pick-4378
...
Document: throw a useful error when an invalid date is given
2016-01-20 14:58:44 -08:00
4017e30cca
Merge pull request #4382 from jekyll/3.0.2-release
...
Release 💎 v3.0.2
2016-01-20 14:34:00 -08:00
e9be8933de
Release 💎 v3.0.2
2016-01-20 14:33:02 -08:00
a72629908a
Document: throw a useful error when an invalid date is given
2016-01-20 14:19:06 -08:00
1ba23c32c6
add Utils.strip_heredoc
2016-01-20 11:46:18 -08:00
ec0eff3315
Switch to pry-byebug so everybody gets the benefit.
2016-01-20 13:30:56 -06:00
f1ac1f2125
Update history to reflect merge of #4376 [ci skip]
2016-01-20 11:07:34 -08:00
7b8c39722b
Merge pull request #4376 from pathawks/detach
...
Merge pull request 4376
2016-01-20 11:07:33 -08:00
af20abf1bc
Update history to reflect merge of #4377 [ci skip]
2016-01-20 11:06:31 -08:00
94b0c500c6
Merge pull request #4377 from liambowers/master
...
Merge pull request 4377
2016-01-20 11:06:31 -08:00
e50d4d6b6e
Fix bad UNLESS.
2016-01-20 07:30:07 -06:00
61acafe97a
Move ByeBug to development and disallow for JRuby.
2016-01-20 07:24:24 -06:00
37e1101690
Re-add Gem version after accidental removal.
2016-01-20 07:04:22 -06:00
f44a9cf401
Added the Wordpress2Jekyll Wordpress plugin
2016-01-20 12:25:29 +00:00
090cf5a50b
Disable auto-regeneration when running server detached
2016-01-19 23:12:59 -08:00
8507cda6dd
Rm date indicators and >1 year inactive sites
2016-01-20 07:22:54 +10:00
805ab6b7f8
Adding commit/date indicators
2016-01-20 06:59:00 +10:00
f8e8672148
Fix #4191 : Reduce Document#post_read complexity slightly.
2016-01-19 11:18:19 -08:00
d50656021f
Fix #4188 : Extract title from filename successfully when dateless.
2016-01-19 11:18:19 -08:00
ecc5121918
Update our badge URL's for more reliability.
2016-01-19 10:15:58 -06:00
56a711f1ee
Move to static Ruby versions so we can test on latest versions.
2016-01-19 10:11:54 -06:00
00285f7b9a
Release 💎 3.1.0.pre.rc2
2016-01-18 15:39:56 -08:00
32fba4f01a
Release 💎 v3.1.0.pre.rc2
2016-01-18 15:39:53 -08:00
be0e951bb0
features: Reorganize step definitions to reduce duplication
2016-01-18 15:35:11 -08:00
d27f1d95d5
features: #run_command should prefix command with $
2016-01-18 15:34:50 -08:00
e75d703806
Page#write? shouldn't freeze 'true'
2016-01-18 15:33:58 -08:00
2d5feab2ae
Update history to reflect merge of #4373 [ci skip]
2016-01-18 15:00:47 -08:00
c5830ce6e0
Merge pull request #4373 from jekyll/page-as-renderable
...
Merge pull request 4373
2016-01-18 15:00:46 -08:00
4de1873b56
Renderer: #output_ext should check to make sure the output extension of the permalink isn't empty
2016-01-18 14:09:14 -08:00
a351a70b03
test: Slight refactor to doublecheck destination.
2016-01-18 14:08:53 -08:00
275d56a0fe
test: use {assert,refute}_exist everywhere
2016-01-18 13:45:36 -08:00
2de5bacb41
pages' permalink' extnames must be respected
...
This reverts a bit of the work @willnorris had made to support
extensionless permalinks. Using the ‘permalink’ front matter will no
longer work as it must allow non-html extensions to be written.
2016-01-18 13:45:17 -08:00
5cf5ce979f
test: add assert_exist and refute_exist
2016-01-18 13:42:03 -08:00
2554281188
document#merge_data!: reformat
2016-01-18 13:41:49 -08:00
Parker Moore
Jordon Bedwell
rebornix
jekyllbot
jekyllbot
David Litvak Bruno
Zshawn Syed
Liam Bowers
Pat Hawks
Brenton Horne