Commit Graph

7634 Commits

Author SHA1 Message Date
XhmikosR dbc0349909 tests: Typo fixes. 2016-07-18 21:20:47 +03:00
jekyllbot 5e74610755 Update history to reflect merge of #5022 [ci skip] 2016-07-15 19:39:42 -07:00
jekyllbot cfeb54d4be Merge pull request #5022 from ayastreb/collection
Merge pull request 5022
2016-07-15 19:39:42 -07:00
jekyllbot 10cfaa2a75 Update history to reflect merge of #5106 [ci skip] 2016-07-15 19:24:03 -07:00
jekyllbot ed98597d49 Merge pull request #5106 from ayastreb/after_init_hook
Merge pull request 5106
2016-07-15 19:24:02 -07:00
jekyllbot 196275f5b4 Update history to reflect merge of #5060 [ci skip] 2016-07-15 17:26:14 -07:00
jekyllbot eb88aa330c Merge pull request #5060 from stomar/stringify-overrides
Merge pull request 5060
2016-07-15 17:26:14 -07:00
jekyllbot 0db1ec339d Update history to reflect merge of #5101 [ci skip] 2016-07-15 09:58:09 -07:00
jekyllbot 3ae7d0c319 Merge pull request #5101 from crispgm/dev_to_integer_filter
Merge pull request 5101
2016-07-15 09:58:08 -07:00
Anatoliy Yastreb b9f232e5bf rubocop: fix methods naming and indentation 2016-07-15 10:59:44 +03:00
Anatoliy Yastreb b88f0a21d6 hooks: move after_init hook call at the end of Site.initialize 2016-07-15 10:31:02 +03:00
jekyllbot 3b6561a57c Update history to reflect merge of #5053 [ci skip] 2016-07-14 19:55:09 -07:00
jekyllbot 4dee1f6aa7 Merge pull request #5053 from stevecheckoway/strict-liquid
Merge pull request 5053
2016-07-14 19:55:08 -07:00
crisp 16ba22f7c3 Add to_integer filter 2016-07-15 08:39:57 +08:00
David Zhang 20b3758edb Add to_integer filter
Add to_integer filter

Fix test_filter: parenthesize the method

Fix offense: seperate every 3 digits with _

rubocop:disable Metrics/ModuleLength

More descriptive exception

Fix fmt error

Remove if stmt for integer input

Remove rescue for to_i

Remove error message assert
2016-07-15 08:38:36 +08:00
Parker Moore f417cf8a0f Merge pull request #5042 from jekyll/fix-more-theme-things
Fix more theme things
2016-07-14 17:14:41 -07:00
Parker Moore 83a72606b3
Add a test to ensure the Apache bug doesn't come up again. 2016-07-14 16:23:02 -07:00
Anatoliy Yastreb 695b5396fd rubocop: fix code style 2016-07-14 09:23:05 +03:00
David Zhang 9ef9c2fb64 Remove error message assert 2016-07-14 14:15:23 +08:00
David Zhang 3435b5ddac Remove rescue for to_i 2016-07-14 14:06:25 +08:00
David Zhang b44457a80b Remove if stmt for integer input 2016-07-14 13:38:14 +08:00
David Zhang e503c17dfa Fix fmt error 2016-07-14 12:00:19 +08:00
David Zhang b1f9a0809c More descriptive exception 2016-07-14 11:27:47 +08:00
David Zhang 5e760a206a rubocop:disable Metrics/ModuleLength 2016-07-14 11:05:30 +08:00
jekyllbot 8a3ea59141 Update history to reflect merge of #5011 [ci skip] 2016-07-13 14:52:11 -07:00
jekyllbot f55cf34739 Merge pull request #5011 from jekyll/maintainer-docs
Merge pull request 5011
2016-07-13 14:52:09 -07:00
Parker Moore 75989fdb3e
Add definitions for feature & bug to maintainer docs. 2016-07-13 14:51:12 -07:00
David Zhang 5c6c01793c Fix offense: seperate every 3 digits with _ 2016-07-13 15:32:34 +08:00
David Zhang 218c7039a9 Fix test_filter: parenthesize the method 2016-07-13 15:13:20 +08:00
David Zhang 9336ad0fcf Add to_integer filter 2016-07-13 14:47:14 +08:00
Parker Moore a3cd584311
Update activesupport handling and add comment to Gemfile.
/cc #5100
2016-07-12 20:17:44 -07:00
jekyllbot cc994105ed Update history to reflect merge of #5100 [ci skip] 2016-07-12 20:16:11 -07:00
jekyllbot 070267af8a Merge pull request #5100 from Crunch09/fix_activesupport_dependency
Merge pull request 5100
2016-07-12 20:16:10 -07:00
jekyllbot f42fac60b0 Update history to reflect merge of #5097 [ci skip] 2016-07-12 20:11:04 -07:00
jekyllbot b1674ed5b1 Merge pull request #5097 from chrisfinazzo/jekyll-community
Merge pull request 5097
2016-07-12 20:11:03 -07:00
David Zhang 5194d1a42c Add to_integer filter 2016-07-13 10:52:18 +08:00
jekyllbot a29498eaae Update history to reflect merge of #5069 [ci skip] 2016-07-12 19:50:33 -07:00
jekyllbot 1f366730f8 Merge pull request #5069 from Crunch09/issue-2834
Merge pull request 5069
2016-07-12 19:50:32 -07:00
jekyllbot 506ba8af1e Update history to reflect merge of #5098 [ci skip] 2016-07-12 19:22:40 -07:00
jekyllbot 49573b6fcf Merge pull request #5098 from esasse/patch-1
Merge pull request 5098
2016-07-12 19:22:39 -07:00
Florian Thomas 0ebf7129cf
use activesupport ~> 4.2 if we are on a Ruby < 2.2.2
activesupport 5.0.x requires a ruby version >= 2.2.2
see 48512d7906/activesupport/activesupport.gemspec (L10)
2016-07-12 22:18:11 +02:00
chrisfinazzo 3674a7760f
Remove JekyllConf from the sidebar 2016-07-11 22:18:12 -04:00
Erick Sasse d683baa257 Updates html-proofer code
As in html-proofer docs: https://github.com/gjtorikian/html-proofer
2016-07-11 23:17:30 -03:00
chrisfinazzo 26b2a6251c
Add a Community section and cleanup, closes #5057 2016-07-11 17:50:24 -04:00
Mike Neumegen 8d2227a03a
added JekyllConf page 2016-07-11 17:03:43 -04:00
jekyllbot 4b5126dda7 Update history to reflect merge of #5067 [ci skip] 2016-07-11 11:20:23 -07:00
jekyllbot 146d0f301d Merge pull request #5067 from jekyll/excerpt-drop-previous-doc
Merge pull request 5067
2016-07-11 11:20:22 -07:00
jekyllbot 5b51b8bdf3 Update history to reflect merge of #5096 [ci skip] 2016-07-11 11:19:31 -07:00
jekyllbot 841727eed7 Merge pull request #5096 from chrisfinazzo/update-normalize-css
Merge pull request 5096
2016-07-11 11:19:30 -07:00
chrisfinazzo 232054a059
Update normalize.css to v4.2.0. 2016-07-11 12:41:42 -04:00