dan
/
jekyll
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
6,987 Commits 2 Branches 2 Tags 21 MiB
Commit Graph

6987 Commits

Author SHA1 Message Date
Jordon Bedwell f80321ecac Update Rake. 
Update Rake and disable verbosity when running the specs because we have some
deprecated usage (for now -- however, see: jekyll/jekyll#4719) and because
Rouge, and Liquid throw out thousands (probably hyperbolic) of warnigns when the
specs are being ran.  We need upstream to fix their problems while we fix ours
or we'll all have a bad day, not that we aren't already.
 2016-03-27 22:22:35 -05:00
jekyllbot f2aa15555b Update history to reflect merge of #4703 [ci skip] 2016-03-25 16:27:39 -07:00
jekyllbot afa89d68f8 Merge pull request #4703 from jekyll/after_init_hook 
Merge pull request 4703
 2016-03-25 16:27:38 -07:00
jekyllbot 9474c370dc Update history to reflect merge of #4712 [ci skip] 2016-03-25 15:11:42 -07:00
jekyllbot a04df2f440 Merge pull request #4712 from chrisfinazzo/highlight-code-samples 
Merge pull request 4712
 2016-03-25 15:11:41 -07:00
chrisfinazzo 7cdc8394aa Highlight the test code 2016-03-25 15:30:53 -04:00
jekyllbot f16c5d0e65 Update history to reflect merge of #4640 [ci skip] 2016-03-25 12:19:17 -07:00
jekyllbot 1ab0ed3664 Merge pull request #4640 from surrim/symlink_static_files 
Merge pull request 4640
 2016-03-25 12:19:17 -07:00
surrim 9be387ef6f readded "env=prod"-condition 2016-03-25 19:42:53 +01:00
jekyllbot 9234fa7510 Update history to reflect merge of #3849 [ci skip] 2016-03-24 13:54:04 -07:00
jekyllbot 7a4817e55a Merge pull request #3849 from shinkondo/master 
Merge pull request 3849
 2016-03-24 13:54:03 -07:00
jekyllbot f0e9b378f6 Update history to reflect merge of #4624 [ci skip] 2016-03-24 12:50:06 -07:00
jekyllbot da4a664290 Merge pull request #4624 from jeffkole/feature/add-collection-url-tag 
Merge pull request 4624
 2016-03-24 12:50:05 -07:00
jekyllbot 9fc4a85806 Update history to reflect merge of #4704 [ci skip] 2016-03-24 12:40:50 -07:00
jekyllbot 59d1a122c6 Merge pull request #4704 from jekyll/parkr-patch-1 
Merge pull request 4704
 2016-03-24 12:40:49 -07:00
jekyllbot 0f2df6c7b3 Update history to reflect merge of #4706 [ci skip] 2016-03-24 12:40:16 -07:00
jekyllbot c7d4386b63 Merge pull request #4706 from yordis/patch-1 
Merge pull request 4706
 2016-03-24 12:40:15 -07:00
Jeff Kolesky 54fcc97725 Checks for link file extension in tests 2016-03-24 08:54:31 -07:00
Yordis Prieto 5f97f928de Updating assets documentation 
Just because developer are lazy and tools like this is for move forward faster, normally we don't read (it's a fact) and because of that I missed this super important sentence. At least this should help.
 2016-03-24 09:52:16 -04:00
Shinn Kondo c27c669796 Fix test teardown for cleaner. 2016-03-23 20:37:13 -05:00
jekyllbot c6564d352b Update history to reflect merge of #4542 [ci skip] 2016-03-23 17:49:47 -07:00
jekyllbot 87d0f03f5c Merge pull request #4542 from jekyll/jekyll-new-with-gemfile 
Merge pull request 4542
 2016-03-23 17:49:46 -07:00
Parker Moore 7695ba6eb4 Add explanation of site variables in the example _config.yml 2016-03-23 17:44:11 -07:00
Shinn Kondo 01d48320fd Merge remote-tracking branch 'upstream/master' 2016-03-23 19:33:22 -05:00
Parker Moore 22d9312eaf Use double quotes in the gemfile 2016-03-23 17:25:19 -07:00
Parker Moore da35e134f1
Add test for creation of Gemfile by 'jekyll new' 2016-03-23 17:24:38 -07:00
Parker Moore 09f9f193d8 Add comment about github-pages 2016-03-23 17:15:35 -07:00
jekyllbot 0c172f6463 Update history to reflect merge of #4533 [ci skip] 2016-03-23 17:01:16 -07:00
jekyllbot 4ce50e3936 Merge pull request #4533 from hgoodman/feature/show-dir-listing 
Merge pull request 4533
 2016-03-23 17:01:16 -07:00
Tom Fejfar 007b7d45dc
Ensure Rouge closes its div/figure properly after highlighting ends. 
Fixes #4474
 2016-03-23 14:04:11 -07:00
Parker Moore 9b60df8883
Add Site#config= which can be used to set the config 2016-03-23 13:14:30 -07:00
Parker Moore 84b7d9b3ac
Add Hook for :site :after_init 2016-03-23 13:14:08 -07:00
jekyllbot b5e459430b Update history to reflect merge of #4700 [ci skip] 2016-03-23 08:46:02 -07:00
jekyllbot d2c754c0fe Merge pull request #4700 from KrzysiekJ/jekyll-paspagon-plugin 
Merge pull request 4700
 2016-03-23 08:46:01 -07:00
Krzysztof Jurewicz 8786163f35 Add jekyll-paspagon plugin 2016-03-23 10:00:13 +01:00
jekyllbot e1fe161071 Update history to reflect merge of #4694 [ci skip] 2016-03-22 15:09:57 -07:00
jekyllbot e873934d60 Merge pull request #4694 from pathawks/pr/xml_escape 
Merge pull request 4694
 2016-03-22 15:09:57 -07:00
jekyllbot f542d817b0 Update history to reflect merge of #4699 [ci skip] 2016-03-22 14:55:55 -07:00
jekyllbot 4cb6b249f1 Merge pull request #4699 from chrisfinazzo/fix-resources-url 
Merge pull request 4699
 2016-03-22 14:55:54 -07:00
chrisfinazzo 27d617a319 Use the correct URL, Fixes #4698 2016-03-22 17:48:57 -04:00
Pat Hawks aeecbd741f
Add test to inspect strings 2016-03-21 15:45:29 -07:00
Pat Hawks b06af5a44f
Use encode for xml_escape filter 2016-03-21 11:07:46 -07:00
jekyllbot 62669d9229 Update history to reflect merge of #4686 [ci skip] 2016-03-21 09:03:53 -07:00
jekyllbot 0a2c8bb26a Merge pull request #4686 from yanisvieilly/patch-1 
Merge pull request 4686
 2016-03-21 09:03:52 -07:00
Yanis Vieilly bbb76a39a2 Update windows.md 
Fix typo on Chocolatey name
 2016-03-20 23:38:45 +01:00
jekyllbot 2736be44c5 Update history to reflect merge of #4491 [ci skip] 2016-03-20 15:34:36 -07:00
jekyllbot 848b1358a1 Merge pull request #4491 from jekyll/ignore-tilde 
Merge pull request 4491
 2016-03-20 15:34:35 -07:00
jekyllbot 526ded00e9 Update history to reflect merge of #4685 [ci skip] 2016-03-20 15:32:46 -07:00
jekyllbot 983cd60a8d Merge pull request #4685 from smacz42/master 
Merge pull request 4685
 2016-03-20 15:32:46 -07:00
AndrewCz a54cedbb72 Additional repo needed for Fedora 23 Workspace 
After running:

    sudo dnf install ruby ruby-devel rubygems nodejs
    sudo dnf group install "C Development and Tools"

I was unable to install Jekyll via `gem` due to an error:

    The compiler failed to generate an executable file. (RuntimeError) You have to install development tools first.

Taken from the [fedoraproject.org](https://developer.fedoraproject.org/tech/languages/ruby/gems-installation.html) Gem page:

>If you installed all the above, but the extensions would still not compile, you are probably running a Fedora image that misses `redhat-rpm-config` >package. In that case gcc compiler would complain about one of the following:

    gcc: error: conftest.c: No such file or directory
    gcc: error: /usr/lib/rpm/redhat/redhat-hardened-cc1: No such file or directory

>To solve this, simply run sudo dnf install `redhat-rpm-config`.

After doing so it downloaded, compiled and installed without a problem.
 2016-03-20 05:53:13 -04:00