Commit Graph

5786 Commits

Author SHA1 Message Date
Jordon Bedwell f054bae503 Add support for JRuby, it was easier than assumed. 2015-05-15 07:10:22 -05:00
Parker Moore 60a811d405 Update history to reflect merge of #3696
[ci skip]
2015-05-11 19:26:25 -07:00
Parker Moore b90f6f77e8 Merge pull request #3696 from fw42/cleaner_optimizations
Merge pull request 3696
2015-05-11 19:25:05 -07:00
Florian Weingarten 15c4d9bee2 Jekyll::Cleaner#existing_files: Call keep_file_regex and keep_dirs only once, not per iteration 2015-05-11 22:01:10 +00:00
Parker Moore 221c0b62b6 Release 💎 3.0.0.pre.beta4 2015-05-10 01:11:01 -07:00
Parker Moore ba12d28fbe Release 💎 v3.0.0.pre.beta4 2015-05-10 01:10:57 -07:00
Parker Moore f34a00490f Update history to reflect merge of #3553
[ci skip]
2015-05-09 23:59:21 -07:00
Parker Moore ce9fcfaebb Merge pull request #3553 from stevecrozz/jekyll-hooks
Merge pull request 3553
2015-05-09 23:58:46 -07:00
Parker Moore e68609c849 Update history to reflect merge of #3693
[ci skip]
2015-05-09 21:34:58 -07:00
Parker Moore 5acac3561a Merge pull request #3693 from fw42/cache_document_to_liquid
Merge pull request 3693
2015-05-09 21:34:37 -07:00
Parker Moore 2b9ce826d6 Update history to reflect merge of #3692
[ci skip]
2015-05-09 21:34:20 -07:00
Parker Moore 9c5c9d826a Merge pull request #3692 from fw42/rubyprof
Merge pull request 3692
2015-05-09 21:33:38 -07:00
Florian Weingarten 56c38f87b2 Add script/rubyprof to generate cachegrind callgraphs 2015-05-10 04:18:04 +00:00
Florian Weingarten f99abc5314 Cache Document#to_liquid 2015-05-10 03:51:50 +00:00
Parker Moore 015e9570cd Update history to reflect merge of #3691
[ci skip]
2015-05-09 11:00:34 -07:00
Parker Moore 3b48dd2652 Merge pull request #3691 from dimitri-koenig/master
Merge pull request 3691
2015-05-09 11:00:08 -07:00
Dimitri König 46895b46a6 Added remote_file_content tag plugin 2015-05-09 17:14:20 +02:00
Jordon Bedwell cd912b5233 Revert using JRuby in an active matrix. 2015-05-09 02:54:52 -05:00
Jordon Bedwell b1e984128e See if Travis still supports JRuby 2.1 and 2.0. 2015-05-09 01:36:55 -05:00
Jordon Bedwell c19ad411a4 Start testing with JRuby too.
However, because JRuby stable does not support 2.0/21 mode on Travis (reliably as far as I'm aware) we only test on JRuby-head right now because we have dropped support for any EOL Ruby and master contains some code that might or might not fail out on 1.9.
2015-05-07 18:22:29 -05:00
Parker Moore a1d78cdea6 Release 💎 3.0.0.pre.beta3 2015-05-06 23:19:27 -07:00
Parker Moore 4b038259c7 Release 💎 v3.0.0.pre.beta3 2015-05-06 23:19:23 -07:00
Stephen Crosby 79a178f7f1 move document.post_render hook to after render call 2015-05-03 13:53:28 -07:00
Stephen Crosby 736e6a78f1 address code review feedback from #3553
- change site:reset to site:after_reset
- raise an exception when registering uncallable hook
- set default hook priority at the public API level
2015-05-02 15:56:19 -07:00
Stephen Crosby 245d9677d7 Refine hook implementation
- hooks are registered to symbol owners rather than classes directly
- during registration, add the ability to specify owner as an array to
  register the same hook to multiple owners
- add optional priority during registration as a symbol (:low, :normal,
  :high)
- implement hooks for collections as they are in octopress-hooks, aside
  from post_init
2015-05-01 19:00:37 -07:00
Stephen Crosby 6ca9633354 prototype of jekyll hooks, encapsulated 2015-05-01 14:35:15 -07:00
Alfred Xing ae584e43ed Update history to reflect merge of #3683 [ci skip] 2015-05-01 09:31:14 -07:00
Alfred Xing 51adebd0db Merge pull request #3683 from chrisfinazzo/troubleshooting-docs
Merge pull request 3683
2015-05-01 09:30:24 -07:00
chrisfinazzo 95a30fa51d Update instructions for Ruby 2.0.0 2015-05-01 11:06:49 -04:00
chrisfinazzo f5351f7268 Use the proper names 2015-05-01 10:34:09 -04:00
Parker Moore bd25c62f55 Merge pull request #3681 from nightsense/master
Fixes typo on doc page "Directory structure".
2015-04-29 17:34:25 -07:00
nightsense cf778e2be6 Fixes typo on doc page "Directory structure". 2015-04-29 19:55:47 -04:00
Parker Moore bda515bfc7 Update history to reflect merge of #3670 [ci skip] 2015-04-29 13:48:04 -07:00
Parker Moore e5bbdb1c83 Merge pull request #3670 from jekyll/bernardodiasc-collections
Merge pull request 3670
2015-04-29 13:47:35 -07:00
Parker Moore 6a26907495 features: update collections features to match new iteration method 2015-04-29 10:49:06 -07:00
Bernardo Dias 8546298047 fix collections output, see #2346 2015-04-29 10:49:06 -07:00
Parker Moore eab92d3b96 Update history to reflect merge of #3678 [ci skip] 2015-04-29 10:36:06 -07:00
Parker Moore d3e867d4a0 Merge pull request #3678 from jekyll/minitest-5-6
Merge pull request 3678
2015-04-29 10:35:40 -07:00
Parker Moore ee7f7baef2 Update history to reflect merge of #3679 [ci skip] 2015-04-29 10:35:23 -07:00
Parker Moore 4e34d2627b Merge pull request #3679 from alfredxing/remove-relative-permalinks
Merge pull request 3679
2015-04-29 10:34:57 -07:00
Alfred Xing 9ab3c201c8 Remove relative permalinks 2015-04-28 14:03:20 -07:00
Matt Sheehan 786f6e1985 Add "Typescript Generator by Matt Sheehan" to the list of third-party plugins. 2015-04-28 12:53:17 -07:00
Parker Moore 6597bacee8 features: Update the way we access Minitest assertions
Per https://github.com/cucumber/cucumber/wiki/Using-MiniTest.
2015-04-28 12:49:45 -07:00
Jordon Bedwell e93e49c269 Update history.md to reflect the merger of #3671 2015-04-26 08:18:24 -05:00
Jordon Bedwell 166fdf35a3 Merge pull request #3671 from falkorichter/completeCiInstructions
Added a mention on the Gemfile to complete the instructions
2015-04-26 08:17:35 -05:00
Falko Richter 159dbd0170 feedback on jekyll#3671 2015-04-24 10:28:40 +02:00
Parker Moore bac28fcfce Merge pull request #3672 from chrisfinazzo/remove-extra-space
Remove extra space
2015-04-21 15:12:00 -07:00
chrisfinazzo 987309917a Remove extra space 2015-04-21 17:32:49 -04:00
Falko Richter 76c1dcc791 added a mention on the Gemfile to complete the instructions
travis relies on a Gemfile tp be present.
2015-04-21 10:53:56 +02:00
Parker Moore 7be47c2c48 ci docs: Add note that the .travis.yml assumes bundle install.
Closes #3660
2015-04-20 10:23:04 -07:00