Commit Graph

1013 Commits

Author SHA1 Message Date
jekyllbot 3a7cbadd82 Merge pull request #5375 from Nicop06/underscore_highlight
Merge pull request 5375
2016-09-20 17:05:49 -07:00
jekyllbot 504411e476 Merge pull request #5237 from ashmaroli/bundle2new
Merge pull request 5237
2016-09-20 15:32:25 -07:00
Parker Moore 279f1516d2
Merge branch 'master' into themes-asset-folder
* master:
  Update history to reflect merge of #5381 [ci skip]
  Update history to reflect merge of #5383 [ci skip]
  run features on windows
  Appease Rubocop
  Update history to reflect merge of #5372 [ci skip]
  Add missing period to sentence in first paragraph.
2016-09-20 13:13:01 -07:00
Parker Moore 29d8fee4ce
Add test to ensure that the /assets theme reader doesn't clobber preexisting site files. 2016-09-20 13:12:34 -07:00
Pat Hawks 3bfdc00d14
Appease Rubocop 2016-09-19 13:15:02 -05:00
Nicolas Porcel 0b94cf3fa1 Allow underscore in highlighter language 2016-09-19 13:10:29 +02:00
Parker Moore 74baeb889a
ThemeAssetsReader: fix tests so everything passes. 2016-09-18 15:04:15 -04:00
Parker Moore 6d7f305e7c
Add tests for assets directory support. 2016-09-16 16:04:35 -07:00
Parker Moore cf26bf5db0
TestTheme: update tests for 'path_for' now that it's no longer prepending the underscore 2016-09-16 15:36:33 -07:00
jekyllbot 4888b84b44 Merge pull request #5199 from jeffkole/adds-linking-to-all-files
Merge pull request 5199
2016-09-13 07:11:50 -07:00
Ashwin Maroli 345f043cc4 test bundle install and skipping it. 2016-09-13 08:52:54 +05:30
Parker Moore c1e6f1fb94
Fix rubocop errors & add one more test for slugify 'ascii' mode (#4680) 2016-09-07 17:50:14 -07:00
Parker Moore 9164973a6c
Merge branch 'jussikinnula-master'
* jussikinnula-master:
  Fix slugify test
  One final "urlsafe" replaced with "ascii"
  Change urlsafe to ascii also when actually slugifying
  Add tests for ascii slugify mode
  Rename urlsafe to ascii, and document it (on utils.rb)
  Add urlsafe to accepted slugify modes
  Add urlsafe method for slugify
2016-09-07 16:50:32 -07:00
jekyllbot 6a34966f20 Merge pull request #5189 from jekyll/skip-theme-if-not-string
Merge pull request 5189
2016-08-30 14:54:47 -07:00
Parker Moore 5b21f8fda9
Fix fmt errors. 2016-08-30 13:28:46 -07:00
Parker Moore 2b15b0b325
Site#configure_theme: don't do anything if theme config is unset; TEST 2016-08-30 12:17:24 -07:00
Ashwin Maroli a9f92278d3 colorize interpolated text in Jekyll.logger.info 2016-08-16 22:50:54 +05:30
Florian Thomas 70ba8c578a
update require_gems test 2016-08-07 21:01:09 +02:00
Florian Thomas 539154a158
replace `assert false, ...` with `refute` 2016-08-07 20:54:22 +02:00
Jeff Kolesky e0ce4a00f8 Fixes `link` tag to work with static files 2016-08-04 20:03:01 -07:00
Jeff Kolesky 05445b81c7 Fixes tests to account for new info.md file 2016-08-04 19:40:14 -07:00
Jeff Kolesky 82d6657ae8 Adds ability to link to all files
Fixes request made in #4624 and bug found in #5182
2016-08-03 15:08:26 -07:00
Florian Thomas d158d73ce1
add missing tests 2016-07-30 15:49:16 +02:00
Florian Thomas 2236ee4284
migrate existing tests to `should` syntax 2016-07-30 15:48:21 +02:00
jekyllbot 0f3ce73516 Merge pull request #4860 from pathawks/pr/where_exp
Merge pull request 4860
2016-07-25 12:16:55 -07:00
Anatoliy Yastreb 9176924eab filters: raise error if no input given to date filters 2016-07-24 01:37:35 +03:00
XhmikosR dbc0349909 tests: Typo fixes. 2016-07-18 21:20:47 +03:00
jekyllbot eb88aa330c Merge pull request #5060 from stomar/stringify-overrides
Merge pull request 5060
2016-07-15 17:26:14 -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
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
Florian Thomas 99663a9199
object needs to respond to select instead of being an enumerable 2016-07-14 13:11:09 -05:00
Pat Hawks 2b57795c7f
Failing test: where_exp filter should filter posts 2016-07-14 13:08:25 -05:00
jekyllbot 1f366730f8 Merge pull request #5069 from Crunch09/issue-2834
Merge pull request 5069
2016-07-12 19:50:32 -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
Florian Thomas cc82d44222
check if relative URL contains a colon
fixes #2834
2016-07-08 20:33:47 +02:00
Marcus Stollsteimer ba8573c420 Change baseurl to example.com for some test cases 2016-07-08 15:48:14 +02:00
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
Parker Moore c46f219d3c
Commit failing test for lack of certain excerpt drop properties. 2016-07-07 13:34:10 -07:00
Marcus Stollsteimer d4c87e3655 Remove useless statement from test 2016-07-07 15:30:59 +02: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
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 12c1ada0e5
test: skip openssl test for jruby 2016-06-28 12:43:15 -07:00
jekyllbot fb1a459ddd Merge pull request #4917 from pathawks/pr/normalize_whitespace
Merge pull request 4917
2016-06-14 14:03:05 -07:00
Parker Moore f5a0db9dcc
Rubocop: use %r for all regular expressions. 2016-06-02 17:08:21 -07:00
jekyllbot 6a07254cbf Merge pull request #4953 from Crunch09/issue-4850
Merge pull request 4953
2016-06-02 16:59:51 -07:00
Pat Hawks 5dfaa66d48 Failing test: markdownify a number 2016-05-28 15:18:37 -05:00