Commit Graph

7408 Commits

Author SHA1 Message Date
Praveen Kumar 712e77abd2 lib/jekyll.rb - fix offenses reported by rubocop
method set_timezone is ignored using rubocop:disable Style/AccessorMethodName
2016-06-03 09:45:15 +05:30
jekyllbot 6e504a0d2e Update history to reflect merge of #4977 [ci skip] 2016-06-02 18:01:55 -07:00
jekyllbot 3531df7428 Merge pull request #4977 from jwillmer/patch-2
Merge pull request 4977
2016-06-02 18:01:54 -07:00
jekyllbot d725991237 Update history to reflect merge of #4962 [ci skip] 2016-06-02 17:12:35 -07:00
jekyllbot fe143c4e8f Merge pull request #4962 from samdutton/patch-1
Merge pull request 4962
2016-06-02 17:12:35 -07:00
jekyllbot 74d363f080 Update history to reflect merge of #4959 [ci skip] 2016-06-02 17:08:05 -07:00
jekyllbot 986eda335c Merge pull request #4959 from derekgottlieb/rubocop-theme-and-url
Merge pull request 4959
2016-06-02 17:08:04 -07:00
jekyllbot 52fcd6981f Update history to reflect merge of #4956 [ci skip] 2016-06-02 17:06:05 -07:00
jekyllbot 5e30823544 Merge pull request #4956 from ayastreb/step_definitions
Merge pull request 4956
2016-06-02 17:06:04 -07:00
jekyllbot 7cd20261ab Update history to reflect merge of #4953 [ci skip] 2016-06-02 16:59:52 -07:00
jekyllbot 6a07254cbf Merge pull request #4953 from Crunch09/issue-4850
Merge pull request 4953
2016-06-02 16:59:51 -07:00
Parker Moore b5cff52f02
Note that where_exp is only a v3.2 feature. Closes #4978. 2016-06-02 14:20:29 -07:00
Jens Willmer d6e58623c6 Fixed typo 2016-06-03 00:05:20 +03:00
Jens Willmer 3a8025cb08 Changed github-gem to github-pages
The gem is technically called github-pages as noted by @parkr in the [pull request](https://github.com/jekyll/jekyll/pull/4977#discussion_r65610202)
2016-06-02 23:33:20 +03:00
jekyllbot 0212c83814 Update history to reflect merge of #4975 [ci skip] 2016-06-02 12:55:15 -07:00
jekyllbot 1e22c3659a Merge pull request #4975 from jwillmer/patch-1
Merge pull request 4975
2016-06-02 12:55:14 -07:00
Jens Willmer d68ddf9dac Included installation instructions 2016-06-02 22:46:05 +03:00
Jens Willmer bbbbb2e704 Installation instructions for github-pages gem 2016-06-02 22:36:07 +03:00
Jens Willmer c2ee828ad6 Added link to windows doc page 2016-06-02 22:19:40 +03:00
jekyllbot 675c105e85 Update history to reflect merge of #4974 [ci skip] 2016-06-02 12:06:56 -07:00
jekyllbot dc4b91b0c8 Merge pull request #4974 from ayastreb/frontmatter_defaults
Merge pull request 4974
2016-06-02 12:06:55 -07:00
Anatoliy Yastreb e7677bdf51 rubocop: revert has_precedence method rename 2016-06-02 21:25:50 +03:00
Jordon Bedwell 97e196cb19 Correct placement of history entry for #4958. 2016-06-02 12:55:47 -05:00
jekyllbot c642b84e80 Update history to reflect merge of #4958 [ci skip] 2016-06-02 10:54:04 -07:00
jekyllbot e367f13f72 Merge pull request #4958 from pathawks/markdownify-to_s
Merge pull request 4958
2016-06-02 10:54:03 -07:00
Jens Willmer 261bc8f467 Added topic link in the URL 2016-06-02 16:44:21 +03:00
Jens Willmer 2bc8dc53ff Added link to windows instructions 2016-06-02 16:32:49 +03:00
Anatoliy Yastreb 597e8ee5d5 rubocop: fix code style 2016-06-02 16:12:16 +03:00
jekyllbot e97fd34479 Update history to reflect merge of #4971 [ci skip] 2016-05-31 08:50:28 -07:00
jekyllbot 7efb0d4856 Merge pull request #4971 from alexcameron89/patch-1
Merge pull request 4971
2016-05-31 08:50:27 -07:00
Alex Kitchens 372f350a75 Remove a Broken Link for Refheap Plugin
The refheap_tag repository no longer exists, and I am not able to find a duplicate repository to replace the link.
2016-05-31 10:44:53 -05:00
Sam Dutton 5acac4a925 Minor tweak to fix missing apostrophne 2016-05-30 09:20:42 +01:00
Derek Gottlieb db6050768d Feedback for flubbed regex and prefer File's directory check 2016-05-28 19:23:23 -05:00
Derek Gottlieb 03f7bc1a8c lib/jekyll/url.rb passing rubocop 2016-05-28 17:15:33 -05:00
Pat Hawks 714c99b418 Convert input to string before markdownify or smartify 2016-05-28 15:19:15 -05:00
Pat Hawks 5dfaa66d48 Failing test: markdownify a number 2016-05-28 15:18:37 -05:00
Derek Gottlieb b5cec7d335 lib/jekyll/theme.rb passing rubocop 2016-05-28 13:51:13 -05:00
Anatoliy Yastreb 22982ef79e rubocop: fix over tabbed variable assignment 2016-05-27 13:59:18 +03:00
Anatoliy Yastreb d5d2fd8674 rubocop: fix code style 2016-05-27 13:34:45 +03:00
Florian Thomas f8c038566c `Serve.process` should receive same config as `Build.process`
fixes #4850
2016-05-27 11:46:04 +02:00
Parker Moore 14c1ac388f
Remove extraneously-checked files. 2016-05-26 16:18:34 -07:00
Parker Moore ca2abea086
Update history to reflect merge of #4932
[ci skip]
2016-05-26 16:10:53 -07:00
Parker Moore 35b3c91b64
Merge branch 'pathawks-readers'
* pathawks-readers:
  I will chain blocks if I want to chain blocks.
  Rubocop: Readers
  Rubocop: lib/jekyll/readers/static_file_reader.rb
  Rubocop: lib/jekyll/readers/post_reader.rb
  Rubocop: lib/jekyll/readers/page_reader.rb
  Rubocop: lib/jekyll/readers/layout_reader.rb
  Rubocop: lib/jekyll/reader.rb
2016-05-26 16:10:21 -07:00
Parker Moore 3a3405fe51
I will chain blocks if I want to chain blocks. 2016-05-26 16:09:56 -07:00
Parker Moore 7a02f29e70
Update history to reflect merge of #4938
[ci skip]
2016-05-26 16:06:04 -07:00
Parker Moore 5e46a02d71
Merge branch 'ayastreb-tags'
* ayastreb-tags:
  rubocop: fix code style
  rubocop: fix spacing in code style
  rubocop: fix code style
  rubocop: fix include tag code style
  rubocop: fix post URL tag code style
  rubocop: fix link tag code style
  rubocop: fix highlight tag code style
2016-05-26 16:05:35 -07:00
jekyllbot 8c231ed50a Update history to reflect merge of #4948 [ci skip] 2016-05-26 16:03:53 -07:00
jekyllbot 8a5148f589 Merge pull request #4948 from pathawks/drops
Merge pull request 4948
2016-05-26 16:03:52 -07:00
jekyllbot 632f3fd8de Update history to reflect merge of #4931 [ci skip] 2016-05-26 10:28:22 -07:00
jekyllbot 8d0a4be5e0 Merge pull request #4931 from pathawks/converters
Merge pull request 4931
2016-05-26 10:28:21 -07:00