Commit Graph

6535 Commits

Author SHA1 Message Date
jekyllbot
0daafd7bda Merge pull request #4361 from jekyll/pheuko-empty-permalink
Merge pull request 4361
2016-01-15 16:19:22 -08:00
Parker Moore
06fa14c11a Restructure data validation so that permalink check raises an error. 2016-01-15 16:11:08 -08:00
Parker Moore
89db3c6384 Convertible: separate data validation out of #read 2016-01-15 15:52:54 -08:00
Parker Moore
948dcf2714 Convertible: consolidate empty check into Convertible#read 2016-01-15 15:51:32 -08:00
Parker Moore
15a2dacd37 Merge pull request #4359 from jekyll/optimize-drop
Fix deep_merge_hashes! handling of drops and hashes
2016-01-15 15:19:18 -08:00
jekyllbot
04e1768807 Update history to reflect merge of #4359 [ci skip] 2016-01-15 15:06:56 -08:00
Jordon Bedwell
ea9cac5214 Add a nasty hack to reduce persistence until RSpec. 2016-01-15 14:15:28 -06:00
Parker Moore
0587a3bb57 Fix some debug logging.
- excluded? should now only print when it is excluded
- requiring is now properly aligned
2016-01-15 11:30:02 -08:00
Parker Moore
207fcbdef7 Add byebug for debugging purposes. 2016-01-15 11:23:09 -08:00
Parker Moore
5d79c55b2c Fix deep_merge_hashes! handling of drops and hashes 2016-01-15 11:22:39 -08:00
Parker Moore
22931f42b8 Drop: require 'json' for #inspect call 2016-01-15 10:00:56 -08:00
Parker Moore
3e81331af1 Utils: don't require mime/types 2016-01-15 10:00:45 -08:00
Pedro Euko
156e093b5c Ensure no errors when there is no permalink 2016-01-15 14:40:59 -02:00
Pedro Euko
5681742223 Check if permalink key was given 2016-01-15 14:40:59 -02:00
Pedro Euko
f8a63157d7 Empty permalink now shows an error 2016-01-15 14:40:47 -02:00
jekyllbot
9368e261cc Update history to reflect merge of #4355 [ci skip] 2016-01-14 16:36:11 -08:00
musoke
54b6395806 Correct typo in ### Precdence
The Precedence section referred to the "last example" where it should have referred to the "second to last."
2016-01-14 16:35:58 -08:00
jekyllbot
4048b8e2a7 Update history to reflect merge of #4350 [ci skip] 2016-01-12 08:28:10 -08:00
jekyllbot
9c4695c47f Merge pull request #4350 from jekyll/pr/cleanup-gemfile
Merge pull request 4350
2016-01-12 08:28:10 -08:00
Jordon Bedwell
5555db8c72 Start using Rubocop from Github, it supports our config. 2016-01-12 06:59:09 -06:00
Jordon Bedwell
712c16a7f1 Try to cleanup the Gemfile... again.
The problem last time was that we removed Pry and Pry brings in CodeRay, we were
testing legacy stuff and didn't have CodeRay in our dependencies, which resulted
in those tests failing.

This also quietly announces the intention to move to RSpec by moving the old
test dependencies to ":test_legacy" and is slightly less agressive in it's
organization than before.
2016-01-12 06:54:45 -06:00
Jordon Bedwell
4595aab855 Update history.makrdown to reflect the merger of #4349. 2016-01-12 01:00:42 -06:00
Jordon Bedwell
9efeade8b4 Merge pull request #4349 from pathawks/fixme
Remove old FIXME
2016-01-12 00:59:42 -06:00
Pat Hawks
ba017ebb97 Remove old Fixme note 2016-01-11 22:32:04 -08:00
Jordon Bedwell
1583b26627 Update jekyll-feed. 2016-01-11 16:45:50 -06:00
Parker Moore
03582c32ed site: update generated history per automatic fixes to History.markdown 2016-01-11 13:37:27 -08:00
Parker Moore
da6618c6fc site: fix :hour, :minute, :second permalink keys to refer to date front matter value
Fixes #4336
2016-01-11 13:37:27 -08:00
jekyllbot
a32c77fb87 Update history to reflect merge of #4347 [ci skip] 2016-01-11 13:10:43 -08:00
jekyllbot
4dccb00832 Merge pull request #4347 from jekyll/rearrange-cucumber-add-flair
Merge pull request 4347
2016-01-11 13:10:42 -08:00
Jordon Bedwell
c5b8b3315f Rearrange Cucumber and add some flair.
* Move step_definitions/jekyll.rb to just step_definitions.rb
* Rename the formatter to Jekyll::Cucumber::Formatter, it's Jekyll's.
* Add some flair; switch to checks!
* Rename env.rb to helpers.rb
2016-01-11 14:55:34 -06:00
jekyllbot
597021a813 Update history to reflect merge of #4343 [ci skip] 2016-01-11 08:56:49 -08:00
jekyllbot
3e30c72994 Merge pull request #4343 from jekyll/pr/cucumber-rspec-expec-jruby-support
Merge pull request 4343
2016-01-11 08:56:48 -08:00
Parker Moore
00b9f9dd62 Revert "Update history to reflect merge of #4344 [ci skip]"
This reverts commit 2f36e09db5.
2016-01-10 19:57:02 -08:00
jekyllbot
2f36e09db5 Update history to reflect merge of #4344 [ci skip] 2016-01-10 19:55:59 -08:00
jekyllbot
d58e38c1a7 Update history to reflect merge of #4344 [ci skip] 2016-01-10 19:55:45 -08:00
jekyllbot
3fd887f648 Merge pull request #4344 from alexjbest/patch-1
Merge pull request 4344
2016-01-10 19:55:44 -08:00
Alex J Best
6048dcdba2 Fixed broken link to blog on using mathjax with jekyll 2016-01-10 22:01:46 +00:00
Jordon Bedwell
e192588013 Cleanup .jrubyrc
* Remove invoked dynamic, it slows down Ruby.
* Remove ObjectSpace which slows down JRuby, we use inheritance now.
* Remove the compat version 9K is Ruby2 by default.
2016-01-10 14:55:35 -06:00
jekyllbot
e888375081 Update history to reflect merge of #4338 [ci skip] 2016-01-10 12:49:31 -08:00
jekyllbot
1de7449767 Merge pull request #4338 from jekyll/pr/add-script-travis
Merge pull request 4338
2016-01-10 12:49:30 -08:00
Jordon Bedwell
9fee9d3d3b Add script/travis so all people can play with Travis-CI images. 2016-01-10 14:46:56 -06:00
jekyllbot
1d38500480 Update history to reflect merge of #4342 [ci skip] 2016-01-10 12:42:01 -08:00
jekyllbot
3c0a1386ea Merge pull request #4342 from jekyll/pr/remove-objectspace-and-use-inherited
Merge pull request 4342
2016-01-10 12:42:01 -08:00
Jordon Bedwell
3c9f159fb8 Move Cucumber to using RSpec-Expections and furthering JRuby support.
* Removes posix-spawn in favor of Open3#popen3
* Encapsulates all the paths into a single easy class.
* Moves to %r{} to avoid ambiguious warnings per-Cucumber suggestion.
* Starts passing around Pathname to make some actions faster.
* Clean's up some methods to make them easier to read.
* AUTOMATIC: Add "#" between each method.
2016-01-10 14:41:48 -06:00
Jordon Bedwell
70f741b86f Remove ObectSpace dumping and start using inherited, it's faster. 2016-01-10 14:08:53 -06:00
jekyllbot
b96b0a80ea Update history to reflect merge of #4340 [ci skip] 2016-01-10 11:11:19 -08:00
jekyllbot
716f912ae7 Merge pull request #4340 from jekyll/pr/implement-codeclimate-platform
Merge pull request 4340
2016-01-10 11:11:18 -08:00
jekyllbot
1aae802ea2 Update history to reflect merge of #4341 [ci skip] 2016-01-10 11:10:10 -08:00
jekyllbot
5dd611d601 Merge pull request #4341 from jekyll/pr/remove-script-rebund
Merge pull request 4341
2016-01-10 11:10:09 -08:00
Jordon Bedwell
55423e344e Add CodeClimate to the testing stuff. 2016-01-10 11:18:46 -06:00