db61028b58
Merge pull request #5258 from ebabel-eu/patch-1
...
Merge pull request 5258
2016-08-19 07:16:04 -07:00
3dcad7284b
combined jekyll and bundler install in one line
2016-08-19 05:46:02 +02:00
830f157f51
Bundler isn't installed by default
...
The bundle command requires the bundler gem to have been installed before it's run.
2016-08-19 05:38:05 +02:00
9061f0b1f3
Update history to reflect merge of #5249 [ci skip]
2016-08-17 17:31:54 -07:00
9716b57e10
Merge pull request #5249 from crispgm/fix-theme-highlight
...
Merge pull request 5249
2016-08-17 17:31:53 -07:00
1e97ae014f
Update history to reflect merge of #5244 [ci skip]
2016-08-17 17:25:17 -07:00
d0ae757714
Merge pull request #5244 from mkasberg/master
...
Merge pull request 5244
2016-08-17 17:25:17 -07:00
06b3d72aa3
Update history to reflect merge of #5254 [ci skip]
2016-08-17 13:44:24 -07:00
1b36e9fe85
Merge pull request #5254 from pmarsceill/fix-logo-stretch
...
Merge pull request 5254
2016-08-17 13:44:23 -07:00
748b2f1279
Maintain aspect ratio with height: auto;
2016-08-17 13:49:32 -04:00
dadf43798e
Update history to reflect merge of #5239 [ci skip]
2016-08-16 11:15:42 -07:00
b82b93c7c0
Merge pull request #5239 from ashmaroli/colorize-embed
...
Merge pull request 5239
2016-08-16 11:15:41 -07:00
a9f92278d3
colorize interpolated text in Jekyll.logger.info
2016-08-16 22:50:54 +05:30
912079a796
Fix theme highlight
2016-08-16 13:57:19 +08:00
e080c7f1ce
Fix a link in deployment-methods.md
...
The link to the scp deploy script was broken - it appears someone
changed the link text and did not update the matching link text in the
markdown footer.
Because the script is really simple, and the script originally linked
includes some unnecessary scss commands, let's just inline the script.
2016-08-15 15:01:59 -06:00
9f8876a332
Update history to reflect merge of #5221 [ci skip]
2016-08-11 18:53:33 -07:00
72629091d1
Merge pull request #5221 from ashmaroli/mod-travis
...
Merge pull request 5221
2016-08-11 18:53:32 -07:00
30399528e4
Update history to reflect merge of #5222 [ci skip]
2016-08-11 14:22:51 -07:00
a49a5dcf4e
Merge pull request #5222 from stkent/patch-1
...
Merge pull request 5222
2016-08-11 14:22:51 -07:00
dca8047f77
Update history to reflect merge of #5226 [ci skip]
2016-08-10 22:21:49 -07:00
5a243fb64c
Merge pull request #5226 from gerardorn/patch-1
...
Merge pull request 5226
2016-08-10 22:21:48 -07:00
3e65dd36a9
fixed typo
2016-08-11 00:03:59 -05:00
b3ce1392db
Add missing comma
2016-08-10 08:02:41 +01:00
1c68c23f85
update rubies in travis
2016-08-10 12:02:01 +05:30
8e361dfe7d
That should be jruby-9.1.2.0.
2016-08-09 23:55:20 -05:00
4d44940b9c
Fix bad colon in .travis.yml
2016-08-09 23:54:21 -05:00
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
088e931901
Update history to reflect merge of #5214 [ci skip]
2016-08-08 19:05:28 -07:00
c526c9dd62
Merge pull request #5214 from DirtyF/fix-5213
...
Merge pull request 5214
2016-08-08 19:05:27 -07:00
519ccdf4d9
Remove mention of page for link tag
...
fix #5213
2016-08-08 21:39:31 +02:00
4bff65be90
Update history to reflect merge of #5167 [ci skip]
2016-08-07 12:42:19 -07:00
554749ae0a
Merge pull request #5167 from Crunch09/plugin_manager_tests
...
Merge pull request 5167
2016-08-07 12:42:18 -07:00
70ba8c578a
update require_gems test
2016-08-07 21:01:09 +02:00
de6476812f
Update history to reflect merge of #5182
...
[ci skip]
2016-08-07 11:55:24 -07:00
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
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
539154a158
replace `assert false, ...` with `refute`
2016-08-07 20:54:22 +02:00
06126af5cc
Update history to reflect merge of #5205 [ci skip]
2016-08-07 11:26:58 -07:00
d9a4f6a59a
Merge pull request #5205 from DirtyF/document-new-theme
...
Merge pull request 5205
2016-08-07 11:26:58 -07:00
bc7aaf5274
Update history to reflect merge of #5183 [ci skip]
2016-08-06 12:30:35 -07:00
d0f55d7207
Merge pull request #5183 from nhoizey/patch-1
...
Merge pull request 5183
2016-08-06 12:30:34 -07:00
c9bf8d0726
Update history to reflect merge of #5196 [ci skip]
2016-08-06 12:27:49 -07:00
61eda2ee40
Merge pull request #5196 from jekyll/site-template-jekyll-feed
...
Merge pull request 5196
2016-08-06 12:27:48 -07:00
aa8d7772d5
fix hightlight tag
2016-08-05 21:25:19 +02:00
6ab8b5ffe1
Documentation : `new-theme` command
2016-08-05 21:15:57 +02:00
50854d2f76
add more link tag usage examples
2016-08-04 10:56:39 +02:00
bc7eb70385
Update history to reflect merge of #5190 [ci skip]
2016-08-03 11:57:52 -07:00
a63a6d8487
Merge pull request #5190 from shingo-nakanishi/master
...
Merge pull request 5190
2016-08-03 11:57:51 -07:00
9e4f469469
Update history to reflect merge of #5194 [ci skip]
2016-08-03 11:57:21 -07:00
ca77dae267
Merge pull request #5194 from nhoizey/patch-2
...
Merge pull request 5194
2016-08-03 11:57:20 -07:00
jekyllbot
Nadjib Amar
jekyllbot
Patrick Marsceill
Ashwin Maroli
David Zhang
Mike Kasberg
Gerardo
Stuart Kent
Jordon Bedwell
Frank Taillandier
Florian Thomas
Parker Moore