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

..

fixtures

Ensure symlinks work as expected (and secured).

2016-04-21 16:32:52 -07:00

safe_glob_test[

Add Utils.safe_glob method

2015-11-19 00:46:46 +13:00

source

Merge pull request #4545 from jekyll/allow-no-extensions-coll-docs

2016-02-29 15:50:29 -08:00

helper.rb

Merge pull request #4942 from pathawks/fp/configuration-from-permalink-fix

2016-05-25 15:42:05 -07:00

simplecov_custom_profile.rb

Rubocop fixes for test/simplecov_custom_profile.rb

2016-05-16 19:26:53 -05:00

test_ansi.rb

Rubocop test cleanups for #4885

2016-05-16 19:26:53 -05:00

test_cleaner.rb

Shortening messages to keep things down to one line where possible

2016-05-16 19:31:43 -05:00

test_coffeescript.rb

Shortening messages to keep things down to one line where possible

2016-05-16 19:31:43 -05:00

test_collections.rb

Shortening messages to keep things down to one line where possible

2016-05-16 19:31:43 -05:00

test_command.rb

Rubocop test cleanups for #4885

2016-05-16 19:26:53 -05:00

test_commands_serve.rb

Fix for jruby

2016-06-28 18:30:02 -07:00

test_configuration.rb

Some weird stuff with Colorator on my machine & jruby.

2016-06-28 14:39:06 -07:00

test_convertible.rb

Rubocop: use %r for all regular expressions.

2016-06-02 17:08:21 -07:00

test_doctor_command.rb

Aligning hashes per 2caff75

2016-05-16 19:48:04 -05:00

test_document.rb

Rubocop: test/test_document.rb

2016-05-25 21:59:33 -05:00

test_entry_filter.rb

Rubocop: use %r for all regular expressions.

2016-06-02 17:08:21 -07:00

test_excerpt_drop.rb

Rubocop fixes

2016-05-24 18:27:37 -05:00

test_excerpt.rb

Moving url to local var for better readability

2016-05-16 20:42:59 -05:00

test_filters.rb

Fix rubocop offenses on master.

2016-06-28 22:08:06 -07:00

test_front_matter_defaults.rb

Merge branch 'pathawks-rubocop/misc'

2016-05-25 17:57:52 -07:00

test_generated_site.rb

Rubocop fixes

2016-05-24 19:01:35 -05:00

test_kramdown.rb

Fix rubocop offenses on master.

2016-06-28 22:08:06 -07:00

test_layout_reader.rb

Aligning hashes per 2caff75

2016-05-16 19:48:04 -05:00

test_liquid_extensions.rb

Rubocop fixes for test/test_liquid_extensions.rb

2016-05-16 19:26:53 -05:00

test_liquid_renderer.rb

Rubocop: use %r for all regular expressions.

2016-06-02 17:08:21 -07:00

test_log_adapter.rb

Moving .with down one line 4x times

2016-05-16 19:59:13 -05:00

test_new_command.rb

Rubocop: use %r for all regular expressions.

2016-06-02 17:08:21 -07:00

test_page.rb

Fix rubocop offenses on master.

2016-06-28 22:08:06 -07:00

test_path_sanitization.rb

Rubocop fixes for test/test_path_sanitization.rb

2016-05-16 19:26:53 -05:00

test_plugin_manager.rb

Rubocop fixes for test/test_plugin_manager.rb

2016-05-16 19:26:53 -05:00

test_rdiscount.rb

Aligning hashes per 2caff75

2016-05-16 19:48:04 -05:00

test_redcarpet.rb

Aligning hashes per 2caff75

2016-05-16 19:48:04 -05:00

test_regenerator.rb

Rubocop: test/test_regenerator.rb

2016-05-25 22:00:29 -05:00

test_related_posts.rb

Rubocop fixes for test/test_related_posts.rb

2016-05-20 21:23:29 -05:00

test_sass.rb

Rubocop fixes for test/test_sass.rb

2016-05-20 21:23:29 -05:00

test_site.rb

Rubocop: test/test_site.rb

2016-05-26 00:00:08 -05:00

test_static_file.rb

Splitting args onto own lines in test/test_static_file.rb

2016-05-20 21:24:34 -05:00

test_tags.rb

Rubocop: use %r for all regular expressions.

2016-06-02 17:08:21 -07:00

test_theme.rb

Rubocop fixes for test/test_theme.rb

2016-05-20 21:23:29 -05:00

test_url.rb

Rubocop fixes for test/test_url.rb

2016-05-20 21:23:29 -05:00

test_utils.rb

Fix for jruby

2016-06-28 18:30:02 -07:00