Commit Graph

7442 Commits

Author SHA1 Message Date
jekyllbot
8b1c3bbf33 Update history to reflect merge of #5005 [ci skip] 2016-06-13 13:17:54 -07:00
jekyllbot
4c4327a14b Merge pull request #5005 from jekyll/doctor-run-generate
Merge pull request 5005
2016-06-13 13:17:53 -07:00
Parker Moore
e6dc78b22f Run Site#generate for 'jekyll doctor' to catch plugin issues. 2016-06-13 13:08:48 -07:00
Jordon Bedwell
dfc7d61765 Mac OS -> MacOS 2016-06-08 23:18:16 -05:00
jekyllbot
2f95517bfd Update history to reflect merge of #4989 [ci skip] 2016-06-06 09:59:05 -07:00
jekyllbot
59a04ab4cb Merge pull request #4989 from chrisfinazzo/normalize-css-v4
Merge pull request 4989
2016-06-06 09:59:05 -07:00
chrisfinazzo
732ca468fa Update normalize.css to v4.0.0. 2016-06-06 11:16:32 -04:00
jekyllbot
43fe09a07b Update history to reflect merge of #4973 [ci skip] 2016-06-06 08:03:37 -07:00
jekyllbot
7197028cd5 Merge pull request #4973 from ayastreb/site
Merge pull request 4973
2016-06-06 08:03:36 -07:00
jekyllbot
915b80b6b3 Update history to reflect merge of #4940 [ci skip] 2016-06-06 07:53:34 -07:00
jekyllbot
c8606c5765 Merge pull request #4940 from DirtyF/feature-rubocop
Merge pull request 4940
2016-06-06 07:53:33 -07:00
DirtyF
f41bd1bab7 Rubocop cleanup 2016-06-06 16:30:09 +02:00
Parker Moore
1f01c88fa0 templates docs: .category, .categories, and .tags only apply to posts. [ci skip]
Fixes #4987.
2016-06-05 16:02:05 -07:00
jekyllbot
688c7b1925 Update history to reflect merge of #4985 [ci skip] 2016-06-04 09:30:26 -07:00
jekyllbot
184da0ca2f Merge pull request #4985 from chrisfinazzo/fix-broken-link
Merge pull request 4985
2016-06-04 09:30:26 -07:00
chrisfinazzo
e0f2848da6 Link to the HTML page instead of Markdown 2016-06-04 12:26:21 -04:00
jekyllbot
652f1bad0b Update history to reflect merge of #4979 [ci skip] 2016-06-03 22:18:39 -07:00
jekyllbot
a5db408d5c Merge pull request #4979 from jekyll/percent_r
Merge pull request 4979
2016-06-03 22:18:38 -07:00
Parker Moore
f5a8000baa Fix regexp literal issues on master. 2016-06-03 22:10:15 -07:00
Parker Moore
8917fa8282 Merge branch 'master' into percent_r
* master: (22 commits)
  Update history to reflect merge of #4980 [ci skip]
  werdz
  Use jekyll-mentions and restructure
  Add post about GSoC project.
  Update history to reflect merge of #4976 [ci skip]
  Amend WEBrick default headers documentation
  Update history to reflect merge of #4966 [ci skip]
  .rubocop.yml - remove lib/jekyll.rb
  lib/jekyll.rb - fix offenses reported by rubocop method set_timezone is ignored using rubocop:disable Style/AccessorMethodName
  Update history to reflect merge of #4977 [ci skip]
  Update history to reflect merge of #4962 [ci skip]
  Update history to reflect merge of #4959 [ci skip]
  Fixed typo
  Changed github-gem to github-pages
  Included installation instructions
  Installation instructions for github-pages gem
  Added link to windows doc page
  Fix inaccurate HTTP response header field name
  Minor tweak to fix missing apostrophne
  Feedback for flubbed regex and prefer File's directory check
  ...
2016-06-03 22:09:15 -07:00
jekyllbot
ea0b43f56d Update history to reflect merge of #4980 [ci skip] 2016-06-03 16:42:37 -07:00
jekyllbot
8308a06b02 Merge pull request #4980 from jekyll/gsoc-update
Merge pull request 4980
2016-06-03 16:42:36 -07:00
Parker Moore
b3583a4236 werdz 2016-06-03 16:41:35 -07:00
Parker Moore
03c2811ae0 Use jekyll-mentions and restructure 2016-06-03 14:58:51 -07:00
Parker Moore
912e6b469a Add post about GSoC project. 2016-06-03 13:47:35 -07:00
jekyllbot
b15423b6a9 Update history to reflect merge of #4976 [ci skip] 2016-06-03 08:12:06 -07:00
jekyllbot
bf524d62aa Merge pull request #4976 from galopin/patch-1
Merge pull request 4976
2016-06-03 08:12:04 -07:00
Michaël Guitton
59bd2587df Amend WEBrick default headers documentation 2016-06-03 10:48:32 +02:00
jekyllbot
1c6916f237 Update history to reflect merge of #4966 [ci skip] 2016-06-02 22:03:03 -07:00
jekyllbot
e2ae0bab8a Merge pull request #4966 from floydpraveen/rubocop-compliant
Merge pull request 4966
2016-06-02 22:03:02 -07:00
Praveen Kumar
93f176f8c5 .rubocop.yml - remove lib/jekyll.rb 2016-06-03 09:45:25 +05:30
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
Parker Moore
f5a0db9dcc Rubocop: use %r for all regular expressions. 2016-06-02 17:08:21 -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