Commit Graph

7823 Commits

Author SHA1 Message Date
jekyllbot
a49a5dcf4e Merge pull request #5222 from stkent/patch-1
Merge pull request 5222
2016-08-11 14:22:51 -07:00
jekyllbot
dca8047f77 Update history to reflect merge of #5226 [ci skip] 2016-08-10 22:21:49 -07:00
jekyllbot
5a243fb64c Merge pull request #5226 from gerardorn/patch-1
Merge pull request 5226
2016-08-10 22:21:48 -07:00
Gerardo
3e65dd36a9 fixed typo 2016-08-11 00:03:59 -05:00
Stuart Kent
b3ce1392db Add missing comma 2016-08-10 08:02:41 +01:00
Jordon Bedwell
8e361dfe7d That should be jruby-9.1.2.0. 2016-08-09 23:55:20 -05:00
Jordon Bedwell
4d44940b9c Fix bad colon in .travis.yml 2016-08-09 23:54:21 -05:00
Jordon Bedwell
fbebdb7ce7 Cleanup .travis.yml so it can be updated more cleanly.
Use shared values in YAML so that only certain pieces of .travis.yml need to be updated in order to update Ruby versions.  Things should cascade so that if people send a pull request they can update just RVM field.
2016-08-09 23:53:59 -05:00
jekyllbot
088e931901 Update history to reflect merge of #5214 [ci skip] 2016-08-08 19:05:28 -07:00
jekyllbot
c526c9dd62 Merge pull request #5214 from DirtyF/fix-5213
Merge pull request 5214
2016-08-08 19:05:27 -07:00
Frank Taillandier
519ccdf4d9 Remove mention of page for link tag
fix #5213
2016-08-08 21:39:31 +02:00
jekyllbot
4bff65be90 Update history to reflect merge of #5167 [ci skip] 2016-08-07 12:42:19 -07:00
jekyllbot
554749ae0a Merge pull request #5167 from Crunch09/plugin_manager_tests
Merge pull request 5167
2016-08-07 12:42:18 -07:00
Florian Thomas
70ba8c578a update require_gems test 2016-08-07 21:01:09 +02:00
Parker Moore
de6476812f Update history to reflect merge of #5182
[ci skip]
2016-08-07 11:55:24 -07:00
Parker Moore
7841db8acf Merge branch 'DirtyF-doc-link-tag'
* DirtyF-doc-link-tag:
  templates.md: {% link %} tag only accepts collection documents
  add more link tag usage examples
  [docs] link tag example for a post
  [docs] Document link Liquid tag
2016-08-07 11:54:40 -07:00
Parker Moore
ab4abb1933 templates.md: {% link %} tag only accepts collection documents
Remove examples of pages/static file links until it's released.
#5182 #5199
2016-08-07 11:54:32 -07:00
Florian Thomas
539154a158 replace assert false, ... with refute 2016-08-07 20:54:22 +02:00
jekyllbot
06126af5cc Update history to reflect merge of #5205 [ci skip] 2016-08-07 11:26:58 -07:00
jekyllbot
d9a4f6a59a Merge pull request #5205 from DirtyF/document-new-theme
Merge pull request 5205
2016-08-07 11:26:58 -07:00
jekyllbot
bc7aaf5274 Update history to reflect merge of #5183 [ci skip] 2016-08-06 12:30:35 -07:00
jekyllbot
d0f55d7207 Merge pull request #5183 from nhoizey/patch-1
Merge pull request 5183
2016-08-06 12:30:34 -07:00
jekyllbot
c9bf8d0726 Update history to reflect merge of #5196 [ci skip] 2016-08-06 12:27:49 -07:00
jekyllbot
61eda2ee40 Merge pull request #5196 from jekyll/site-template-jekyll-feed
Merge pull request 5196
2016-08-06 12:27:48 -07:00
Frank Taillandier
aa8d7772d5 fix hightlight tag 2016-08-05 21:25:19 +02:00
Frank Taillandier
6ab8b5ffe1 Documentation : new-theme command 2016-08-05 21:15:57 +02:00
Frank Taillandier
50854d2f76 add more link tag usage examples 2016-08-04 10:56:39 +02:00
jekyllbot
bc7eb70385 Update history to reflect merge of #5190 [ci skip] 2016-08-03 11:57:52 -07:00
jekyllbot
a63a6d8487 Merge pull request #5190 from shingo-nakanishi/master
Merge pull request 5190
2016-08-03 11:57:51 -07:00
jekyllbot
9e4f469469 Update history to reflect merge of #5194 [ci skip] 2016-08-03 11:57:21 -07:00
jekyllbot
ca77dae267 Merge pull request #5194 from nhoizey/patch-2
Merge pull request 5194
2016-08-03 11:57:20 -07:00
Ben Balter
58cd8f3f4e use jekyll-feed for default site RSS feed 2016-08-03 12:10:44 -04:00
Nicolas Hoizey
ddff013696 Fix path in the prompt 2016-08-03 14:00:53 +02:00
shingo-nakanishi
f084de7bc9 need subcommand build
simply run the `jekyll` shows

```
A subcommand is required. 
jekyll 3.2.1 -- Jekyll is a blog-aware, static site generator in Ruby
``` 

need subcommand build
2016-08-03 10:56:43 +09:00
jekyllbot
01c59004e9 Update history to reflect merge of #5180 [ci skip] 2016-08-02 17:42:13 -07:00
jekyllbot
cb99cf603a Merge pull request #5180 from XhmikosR/patch-1
Merge pull request 5180
2016-08-02 17:42:12 -07:00
jekyllbot
d3ae8403ea Update history to reflect merge of #5185 [ci skip] 2016-08-02 17:30:21 -07:00
jekyllbot
997c61470b Merge pull request #5185 from crispgm/doc-for-filters
Merge pull request 5185
2016-08-02 17:30:20 -07:00
Parker Moore
da0b456288 Release 💎 3.2.1 v3.2.1 2016-08-02 17:06:23 -07:00
Parker Moore
eef3687486 Merge pull request #5187 from jekyll/release-3-2-1
Site updates for v3.2.1
2016-08-02 17:04:36 -07:00
Parker Moore
b5dcd4b295 New site/latest_version.txt 2016-08-02 16:17:28 -07:00
Parker Moore
57c6408b7f Do not generate the site in verbose mode. 2016-08-02 16:17:28 -07:00
Parker Moore
d504eb5ce9 Gemfile: Be looser about jekyll plugin versions. 2016-08-02 16:17:28 -07:00
Parker Moore
15dc18343c Add release post for 3.2.1 & update History & version 2016-08-02 16:17:28 -07:00
jekyllbot
d4a68eb642 Update history to reflect merge of #5188 [ci skip] 2016-08-02 16:13:07 -07:00
jekyllbot
a7bc7ff9c7 Merge pull request #5188 from jekyll/default-site-read-from-local
Merge pull request 5188
2016-08-02 16:13:06 -07:00
Parker Moore
3943de066c script/default-site: read Jekyll source from local clone
If you bump the version in the repo, then it all goes haywire.
2016-08-02 15:55:33 -07:00
DirtyF
d5e96757a5 [docs] link tag example for a post
* put link tag before post_url
* example of link to a post with link tag
2016-08-02 20:24:30 +02:00
XhmikosR
801d12b916 Gemfile: specify x64_mingw for the optional deps. 2016-08-02 20:39:27 +03:00
XhmikosR
050aacfc85 Update appveyor.yml.
* rename variables
* add `default-site` target
* remove `fast_finish` in order to match Travis CI behavior
* run cucumber tests only on the latest Ruby
2016-08-02 20:39:27 +03:00