Parker Moore
|
722c49cd6f
|
script/backport-pr: cherry-pick the commit properly
We used to do traditional merges but since we started doing squash merges,
we don't want the -m1 flag for git-cherry-pick.
|
2017-08-12 16:08:10 -04:00 |
jekyllbot
|
c810d761f7
|
Update history to reflect merge of #6274 [ci skip]
|
2017-08-12 15:18:52 -04:00 |
André Jaenisch
|
d4443e43d6
|
Execute build command using bundle. (#6274)
Merge pull request 6274
|
2017-08-12 15:18:51 -04:00 |
|
jekyllbot
|
a761a7acbc
|
Update history to reflect merge of #6289 [ci skip]
|
2017-08-10 16:40:08 -04:00 |
|
Parker Moore
|
c059675bcc
|
script/backport-pr: commit message no longer includes the # (#6289)
Merge pull request 6289
|
2017-08-10 16:40:06 -04:00 |
|
jekyllbot
|
073d2f1e6a
|
Update history to reflect merge of #6284 [ci skip]
|
2017-08-10 16:27:16 -04:00 |
|
Parker Moore
|
3f0c77cfd5
|
Add a quick test for DataReader (#6284)
Merge pull request 6284
|
2017-08-10 16:27:14 -04:00 |
|
jekyllbot
|
dfdefcf367
|
Update history to reflect merge of #6280 [ci skip]
|
2017-08-10 11:14:54 -04:00 |
Ben Balter
|
045226f160
|
Guard against type error in absolute url (#6280)
Merge pull request 6280
|
2017-08-10 11:14:52 -04:00 |
|
jekyllbot
|
29b96f4408
|
Update history to reflect merge of #6283 [ci skip]
|
2017-08-09 19:16:06 -04:00 |
Pedro Lamas
|
a4181459b9
|
Fixes minor typo in post text (#6283)
Merge pull request 6283
|
2017-08-09 19:16:05 -04:00 |
|
jekyllbot
|
e39558f837
|
Update history to reflect merge of #6264 [ci skip]
|
2017-08-08 23:25:06 -04:00 |
lymaconsulting
|
bc962fe7d8
|
Customizing url in collection elements clarified (#6264)
Merge pull request 6264
|
2017-08-08 23:25:04 -04:00 |
|
jekyllbot
|
fbabb1eb26
|
Update history to reflect merge of #6281 [ci skip]
|
2017-08-08 23:10:39 -04:00 |
|
Parker Moore
|
bd31986ad6
|
Fix Drop#key? so it can handle a nil argument (#6281)
Merge pull request 6281
|
2017-08-08 23:10:38 -04:00 |
|
jekyllbot
|
3fab69e3c9
|
Update history to reflect merge of #6200 [ci skip]
|
2017-08-07 12:13:35 -04:00 |
ashmaroli
|
c8eee7ffcb
|
Access custom config array throughout session (#6200)
Merge pull request 6200
|
2017-08-07 12:13:33 -04:00 |
|
jekyllbot
|
adde25120c
|
Update history to reflect merge of #6277 [ci skip]
|
2017-08-06 10:49:02 -04:00 |
Florian Thomas
|
39631db0bd
|
make flakey test more robust (#6277)
Merge pull request 6277
|
2017-08-06 10:49:01 -04:00 |
|
jekyllbot
|
6b1aa4ce01
|
Update history to reflect merge of #6273 [ci skip]
|
2017-08-05 11:01:42 -04:00 |
Kyle Zhao
|
a99186fe0a
|
delegate `StaticFile#to_json` to `StaticFile#to_liquid` for a more (#6273)
Merge pull request 6273
|
2017-08-05 11:01:40 -04:00 |
|
jekyllbot
|
5c2e75823a
|
Update history to reflect merge of #6266 [ci skip]
|
2017-08-04 15:53:27 -04:00 |
|
Parker Moore
|
d8dfc33b8b
|
Memoize the return value of Document#url (#6266)
Merge pull request 6266
|
2017-08-04 15:53:26 -04:00 |
|
jekyllbot
|
305e293d46
|
Update history to reflect merge of #6257 [ci skip]
|
2017-08-03 23:10:19 -04:00 |
|
ashmaroli
|
8cade08de0
|
update theme-template README (#6257)
Merge pull request 6257
|
2017-08-03 23:10:18 -04:00 |
|
Parker Moore
|
922fa53401
|
Update history in docs site based on recent updates to History.markdown
|
2017-08-03 22:47:28 -04:00 |
|
jekyllbot
|
828ee760c2
|
Update history to reflect merge of #6206 [ci skip]
|
2017-08-03 22:00:25 -04:00 |
|
Florian Thomas
|
cc1cb8150a
|
set `LiquidError#template_name` for errors in included file (#6206)
Merge pull request 6206
|
2017-08-03 22:00:24 -04:00 |
|
jekyllbot
|
73419cb374
|
Update history to reflect merge of #6265 [ci skip]
|
2017-08-03 21:27:33 -04:00 |
|
Parker Moore
|
7cf5f51ca2
|
Enforce Style/FrozenStringLiteralComment. (#6265)
Merge pull request 6265
|
2017-08-03 21:27:32 -04:00 |
|
jekyllbot
|
f9f05e3f75
|
Update history to reflect merge of #6262 [ci skip]
|
2017-08-03 08:40:15 -04:00 |
Sid Verma
|
eac51ba189
|
Update deprecated gems key to plugins. (#6262)
Merge pull request 6262
|
2017-08-03 08:40:14 -04:00 |
|
Parker Moore
|
56436f46fe
|
Update History.markdown to unify Bug Fixes and fix
|
2017-07-30 19:20:21 -04:00 |
|
jekyllbot
|
34967978c2
|
Update history to reflect merge of #6253 [ci skip]
|
2017-07-30 15:12:43 -04:00 |
Ben Balter
|
b35c0d8607
|
Call to_s on site.url before attempting to concatenate strings (#6253)
Merge pull request 6253
|
2017-07-30 15:12:42 -04:00 |
|
jekyllbot
|
a6efa48883
|
Update history to reflect merge of #6255 [ci skip]
|
2017-07-30 14:32:26 -04:00 |
Frank Taillandier
|
12832af98e
|
docs: add missing backticks in History (#6255)
Merge pull request 6255
|
2017-07-30 14:32:25 -04:00 |
|
jekyllbot
|
f8d06f20aa
|
Update history to reflect merge of #6247 [ci skip]
|
2017-07-28 12:05:45 -04:00 |
|
Parker Moore
|
143367c5ca
|
kramdown: symbolize keys in-place (#6247)
Merge pull request 6247
|
2017-07-28 12:05:43 -04:00 |
|
jekyllbot
|
592daf4ce2
|
Update history to reflect merge of #6239 [ci skip]
|
2017-07-26 20:09:35 -04:00 |
|
ashmaroli
|
82c219a2e7
|
exit site.process sooner (#6239)
Merge pull request 6239
|
2017-07-26 20:09:33 -04:00 |
|
jekyllbot
|
590dd6cf80
|
Update history to reflect merge of #6087 [ci skip]
|
2017-07-25 19:20:21 -04:00 |
Bogdan
|
8f1959bbc4
|
Define path with __dir__ (#6087)
Merge pull request 6087
|
2017-07-25 19:20:20 -04:00 |
|
jekyllbot
|
8a017b5a2a
|
Update history to reflect merge of #6220 [ci skip]
|
2017-07-25 18:45:45 -04:00 |
|
ashmaroli
|
96724af03e
|
Bump supported Ruby version to >= 2.1.0 (#6220)
Merge pull request 6220
|
2017-07-25 18:45:44 -04:00 |
|
jekyllbot
|
4493f2a58b
|
Update history to reflect merge of #6225 [ci skip]
|
2017-07-25 18:23:39 -04:00 |
Joshua Byrd
|
93169f60c3
|
Adding DevKit helpers (#6225)
Merge pull request 6225
|
2017-07-25 18:23:38 -04:00 |
|
jekyllbot
|
7b255baac2
|
Update history to reflect merge of #6226 [ci skip]
|
2017-07-25 18:23:04 -04:00 |
|
Parker Moore
|
188bc71713
|
Reader#read_directories: guard against an entry not being a directory (#6226)
Merge pull request 6226
|
2017-07-25 18:23:02 -04:00 |
|
jekyllbot
|
897cdbb427
|
Update history to reflect merge of #6231 [ci skip]
|
2017-07-25 18:22:41 -04:00 |