657b6b328c
Update history to reflect merge of #4307
...
[ci skip]
2016-01-04 16:26:02 -08:00
f47612ee98
Merge pull request #4307 from fulldecent/patch-1
...
Merge pull request 4307
2016-01-04 16:25:41 -08:00
a9b80b2f06
features/layout_data: add scenario for inheriting layout data from child to parent
...
Ref: https://github.com/jekyll/jekyll/pull/4312#discussion_r48781985
2016-01-04 16:21:53 -08:00
d37de5c8df
If the subcommand cannot be found, suggest the installation of a gem.
2016-01-04 16:17:48 -08:00
4fe9eecf05
For blessed gems, shim their commands so users know how to use them.
2016-01-04 16:10:21 -08:00
10a1b9451a
Update history to reflect merge of #4290
...
[ci skip]
2016-01-04 14:57:59 -08:00
a78230ccdb
Merge pull request #4290 from jekyll/deal-with-extraneous-spaces
...
Merge pull request 4290
2016-01-04 14:57:22 -08:00
cb5bc1093e
utils: has_yaml_header? should accept files with extraneous spaces
...
Occasionally, extra spaces at the end of the YAML front matter prologue are
saved to a file and it goes missing without telling the user why. This
should simply accept those changes without any detriment to the user,
allowing anyone to add as many spaces as they like to the end of their
front matter prologues.
2016-01-04 14:09:30 -08:00
1ea667474b
Clean up the permalink front matter protip
...
Ref #4296 .
2016-01-04 13:24:14 -08:00
ed815b0d2c
Update history to reflect merge of #4296
...
[ci skip]
2016-01-04 13:07:33 -08:00
c603be6a38
Merge pull request #4296 from kakoma/master
...
Merge pull request 4296
2016-01-04 13:07:12 -08:00
ee2db21202
Update history to reflect merge of #4312
...
[ci skip]
2016-01-04 13:05:19 -08:00
e097a15657
Merge pull request #4312 from jekyll/fix-layout-metadata
...
Merge pull request 4312
2016-01-04 13:05:00 -08:00
a62e085ea0
Update history to reflect merge of #4311
...
[ci skip]
2016-01-04 13:04:38 -08:00
378ec5a4b8
Merge pull request #4311 from jekyll/use-drop-hash-accessor
...
Merge pull request 4311
2016-01-04 13:04:14 -08:00
e10c483ec3
Adjust Rubocop to fit in a bit better.
2016-01-04 14:44:13 -06:00
95a3c54ddb
drop: only check mutable if the key is a method
2016-01-04 12:41:40 -08:00
62d7f5ecad
Add feature test for layout data
...
Fixes issue defined here:
https://github.com/jekyll/jekyll/issues/4246#issuecomment-168367510
2016-01-04 12:38:41 -08:00
06c45df8c3
Drop: hash syntax should use setter method for a property if it's defined
2016-01-04 12:38:41 -08:00
2756503e7b
features/hooks: use hash syntax to access page
2016-01-04 12:37:19 -08:00
735194ccaf
Convertible/Page/Renderer: use payload hash accessor & setter syntax
2016-01-04 12:37:19 -08:00
87978e79f4
features/step_definitions: use $stderr instead of STDERR
...
Fixes c273d91df1 (commitcomment-15251676)
2016-01-04 12:36:05 -08:00
eaade1e49a
Update history to reflect merge of #4301
...
[ci skip]
2016-01-04 12:32:15 -08:00
5580972282
Merge pull request #4301 from pathawks/rubocop
...
Merge pull request 4301
2016-01-04 12:31:55 -08:00
060904d809
Rubocop: Style/TrailingWhitespace
...
- Trailing whitespace detected
Rubocop: Style/EmptyLines
- Extra blank line detected
Rubocop: Style/EmptyLinesAroundBlockBody
- Extra empty line detected at block body beginning
2016-01-04 12:16:36 -08:00
ab3d906e04
Rubocop: Style/ParenthesesAroundCondition
...
- Don't use parentheses around the condition of an if
2016-01-04 12:14:00 -08:00
cce848d3d8
Rubocop: Avoid single-line method definitions
2016-01-04 12:12:17 -08:00
c273d91df1
cucumber: fix issue where an undefined step would cause an exception
2016-01-04 12:08:02 -08:00
c1c8b6dbf7
Rubocop: Style/SpaceInsideHashLiteralBraces
2016-01-04 12:07:34 -08:00
04e635b10c
Rubocop: Style/SpaceInsideRangeLiteral
...
- Space inside range literal
2016-01-04 12:06:40 -08:00
6711234d5f
Rubocop: Style/BlockDelimiters
...
- Avoid using {...} for multi-line blocks
2016-01-04 12:05:54 -08:00
086e85ca9e
Rubocop: Style/PerlBackrefs
...
- Avoid the use of Perl-style backrefs
2016-01-04 12:01:23 -08:00
be3666fcf0
Rubocop: Do not use unless with else
...
- Rewrite these with the positive case first
2016-01-04 11:51:14 -08:00
ec83ef60b5
Rubocop: Lint/UselessAssignment
2016-01-04 11:49:54 -08:00
085a778b0a
Rubocop: Style/NestedTernaryOperator
...
- Ternary operators must not be nested. Prefer if/else constructs instead.
2016-01-04 11:46:25 -08:00
78e9f3389e
Rubocop: Style/IndentationWidth
2016-01-04 11:42:17 -08:00
f9926edbc4
Rubocop: Style/TrivialAccessors
...
- Use `attr_writer` to define trivial writer methods
2016-01-04 11:39:14 -08:00
af9ec6831d
Rubocop: Style/ElseAlignment
...
- Align else with if
Rubocop: Lint/EndAlignment
- Align end with if
2016-01-04 11:23:06 -08:00
c4047c37b2
Update history to reflect merge of #4303
...
[ci skip]
2016-01-04 11:16:05 -08:00
f6fd9014ba
Rubocop: Style/CaseIndentation
...
- Indent when as deep as case
2016-01-04 11:15:37 -08:00
046928e395
upgrading docs: add note about removing relative permalinks support (2 to 3)
...
Ref: #4303 .
2016-01-04 11:15:16 -08:00
c38e1fcbb8
Merge pull request #4303 from alistaircom/patch-1
...
Added content on relative permalinks
2016-01-04 11:14:56 -08:00
2c9a349f9a
Rubocop: Style/Next
...
- Use next to skip iteration
2016-01-04 11:10:52 -08:00
f221b925b4
Rubocop: Lint/StringConversionInInterpolation
...
- Redundant use of Object#to_s in interpolation
2016-01-04 11:08:31 -08:00
13c980c896
Rubocop: Style/TrailingComma
2016-01-04 11:08:31 -08:00
4c5d77a4b5
Rubocop: Style/EmptyLines
2016-01-04 11:08:18 -08:00
224a1ab9ef
Merge pull request #4305 from Atul9/master
...
Update copyright notices to 2016 [ci skip]
2016-01-03 21:50:18 -08:00
fd8fdd87d3
Rubocop: Style/RegexpLiteral
2016-01-03 17:10:39 -08:00
e3189e3828
Rubocop: Lint/UnusedMethodArgument
2016-01-03 17:07:39 -08:00
11f0aab4b1
Rubocop: Lint/UnusedBlockArgument
...
- Unused block argument
2016-01-03 16:24:13 -08:00
Parker Moore
Jordon Bedwell
Pat Hawks