Commit Graph

7180 Commits

Author SHA1 Message Date
jekyllbot b40524fbc3 Merge pull request #4890 from dinamicoplus/patch-1
Merge pull request 4890
2016-05-13 10:12:36 -05:00
Marcos Brito 1e89aa7a13 Removed extra </p> from site/_docs/permalinks.md
It seems there's an extra </p> in the html code, in the line number 103.
2016-05-13 14:39:56 +02:00
jekyllbot f2bad8524f Update history to reflect merge of #4849 [ci skip] 2016-05-12 15:25:10 -05:00
jekyllbot 8c9492d5fa Merge pull request #4849 from envygeeks/master
Merge pull request 4849
2016-05-12 15:25:10 -05:00
jekyllbot 207e4df3de Update history to reflect merge of #4887 [ci skip] 2016-05-12 14:56:49 -05:00
jekyllbot f615475378 Merge pull request #4887 from jekyll/pull/add-jekyll-tips
Merge pull request 4887
2016-05-12 14:56:48 -05:00
Parker Moore 5258f78a51 Add Jekyll Tips and the Cheatsheet to the list of resources 2016-05-12 14:54:40 -05:00
jekyllbot 73ae01b4e5 Update history to reflect merge of #4886 [ci skip] 2016-05-12 14:45:02 -05:00
jekyllbot 13eaa4fd77 Merge pull request #4886 from jekyll/enable-rubocop
Merge pull request 4886
2016-05-12 14:45:00 -05:00
Parker Moore 3b021c6046
Move Rubocop gem to :test group in Gemfile 2016-05-12 14:33:48 -05:00
Parker Moore 419c670947
travis: run one script/fmt job 2016-05-12 14:17:45 -05:00
Parker Moore cddc40fef4
rubocop: exclude test and features files that fail 2016-05-12 14:14:44 -05:00
Parker Moore 85e3ce37af
rubocop: %r should use exclamation marks as delimeters 2016-05-12 14:11:59 -05:00
Parker Moore fa3323ec92
rubocop: default for Lint/AmbiguousRegexpLiteral 2016-05-12 14:05:16 -05:00
Parker Moore ffe6e0d996
rubocop: enforce Style/StringLiterals 2016-05-12 14:00:49 -05:00
Parker Moore b28e14bcd6
create script/fmt to format the code 2016-05-12 13:42:05 -05:00
Parker Moore 917b470459
merge rubocop rules with the ones from pages-gem 2016-05-12 13:41:53 -05:00
Parker Moore 1ae4f513d8
Add 'ruby' to pre-filled Gemfile for 'jekyll new'
Fixes #4839
2016-05-12 12:19:46 -05:00
jekyllbot 209cd6b729 Update history to reflect merge of #4859 [ci skip] 2016-05-12 12:16:35 -05:00
jekyllbot 1504864d9e Merge pull request #4859 from jekyll/feature/allow-excludes-to-leave-the-insane-asylum
Merge pull request 4859
2016-05-12 12:16:35 -05:00
Jordon Bedwell 3751b47c50
Cleanup EntryFilter and make it far more robust.
* Allow users to filter directories by ending their path with "/"
* Allow users to filter with a Regexp, some scenariors can really require it.
* Use Pathutil#in_path? for Symlink verification, it real/expand.

This also requires some downstream work in "jekyll-watch" which at this time is
not very robust, it doesn't recognize the difference either, and should probably
start doing so (what I mean is detecting "/" and using the full path.)
2016-05-10 20:01:02 -05:00
jekyllbot 92720363e1 Update history to reflect merge of #4863 [ci skip] 2016-05-10 12:35:42 -07:00
jekyllbot 4986cb78a3 Merge pull request #4863 from xHN35RQ/patch-1
Merge pull request 4863
2016-05-10 12:35:42 -07:00
jekyllbot 7f3a9e1f40 Update history to reflect merge of #4872 [ci skip] 2016-05-10 12:34:02 -07:00
jekyllbot cd861d7fc5 Merge pull request #4872 from mdxprograms/patch-1
Merge pull request 4872
2016-05-10 12:34:01 -07:00
jekyllbot 4dab3dd423 Update history to reflect merge of #4874 [ci skip] 2016-05-10 12:33:15 -07:00
jekyllbot 8f79551da3 Merge pull request #4874 from git-no/master
Merge pull request 4874
2016-05-10 12:33:14 -07:00
No d9ab71cb59 Breadcrumbs integration for Jekyll 3.x 2016-05-07 20:15:16 +02:00
Josh Waller 770b6ab073 Adding pug plugin
Jade has been moved to Pug https://github.com/pugjs/pug
This was forked from the previous Jade plugin and merged the pug update to maintain the newer version and avoid deprecation usage.
2016-05-07 08:37:34 -04:00
Jordon Bedwell b7bf19ff31 Merge pull request #4867 from dudepare/master
Fixed a typo
2016-05-05 03:32:51 -05:00
Andrew Artajos 2d8a228b59 Fixed a typo
Fixed a typo from indend to indent. Just making the code more readable.
2016-05-05 09:14:03 +10:00
Nick 55734ee482 Add jekyll-ideal-image-slider 2016-05-03 12:27:37 -07:00
jekyllbot 53d6b91fc8 Update history to reflect merge of #4857 [ci skip] 2016-04-29 12:22:47 -07:00
jekyllbot 6c081427c4 Merge pull request #4857 from jekyll/fix/dont-rescue-load-error-for-bundler
Merge pull request 4857
2016-04-29 12:22:46 -07:00
Jordon Bedwell 44cf61d241
Fix #4856: Don't rescue LoadError or bundler load errors for Bundler.
When it comes to bundler it's smart enough to know what to require, and in casees it's not, it's smart enough to accept :require.  In most cases when bundler has a LoadError (or otherwise) it's because there is a problem inside of the Gem itself and when this happens, Jekyll will happily let that error slip when it shouldn't, resulting in a badly placed error that is actually wrong. This corrects that so errors can surface properly.
2016-04-29 06:37:57 -05:00
jekyllbot b8e7669228 Update history to reflect merge of #4855 [ci skip] 2016-04-28 19:07:17 -07:00
jekyllbot 51c0c934d3 Merge pull request #4855 from jekyll/upgrade/update-colorator-to-1.0
Merge pull request 4855
2016-04-28 19:07:16 -07:00
Jordon Bedwell 46f54e6b94
Update Colorator to 1.0 2016-04-28 20:58:05 -05:00
jekyllbot 0ee1a75d16 Update history to reflect merge of #4854 [ci skip] 2016-04-28 18:27:57 -07:00
jekyllbot c9d5c7d30a Merge pull request #4854 from jekyll/site-improvements
Merge pull request 4854
2016-04-28 18:27:56 -07:00
Parker Moore 342d5a4250
site: optimize liquid for whitespace removal 2016-04-28 18:26:44 -07:00
Parker Moore 19b566e6ea
site: use rouge instead of pygments 2016-04-28 18:26:29 -07:00
Parker Moore d74f8d6dd9
Fix spacing on the msg in Configuration#renamed_key 2016-04-28 17:55:15 -07:00
Jordon Bedwell 035352feff Update the ISSUE_TEMPLATE.md file.
* Link to jekyllrb.com as @parkr suggested.
* Add a few more directions and hints for Github Pages users who have errors.
* Add words that were missing and made stuff make no sense.
2016-04-28 04:28:15 -05:00
Jordon Bedwell a04c45a2b6 Make the issue template more robust.
This makes the issue template more robust, making check boxes so users can submit and check or check as they go.  It also starts using HTML comments so that directions for the users aren't always displayed to us (gotta love Markdown.) And provides the users with more hints on what we would like from them when filing a ticket.
2016-04-27 13:36:37 -05:00
Parker Moore 6ed193277d Merge pull request #4847 from jekyll/3-0-5-release-post
Add release notes for v3.0.5
2016-04-26 18:01:01 -07:00
Parker Moore 960342eb38
Add link to history doc. 2016-04-26 18:00:33 -07:00
Parker Moore 008e694732
Compile history. 2016-04-26 17:59:05 -07:00
Parker Moore 4d264b5b9c
Add release notes for v3.0.5 2016-04-26 17:57:07 -07:00
Jordon Bedwell b45f575ffe Move to the Rubocop Gem, they've 2.3+ support and TargetVersion deployed now.
Previously we relied on the Git version of Rubocop so that we could get 2.3+ and TargetVersion support in our .rubocop.yml, they have since updated stable and made this available to the general public.
2016-04-26 19:19:53 -05:00