Commit Graph

9177 Commits

Author SHA1 Message Date
David Zhang
df25873ed4 Rename CODE_OF_CONDUCT to show in banner (#6325)
Merge pull request 6325
2017-08-19 07:19:59 -04:00
jekyllbot
851c36d828 Update history to reflect merge of #6326 [ci skip] 2017-08-19 07:11:30 -04:00
Frank Taillandier
1d3fa81d53 plugins is the new gems (#6326)
Merge pull request 6326
2017-08-19 07:11:29 -04:00
jekyllbot
5cc2b6affc Update history to reflect merge of #6324 [ci skip] 2017-08-18 18:01:03 -04:00
Frank Taillandier
ee23d06507 add SUPPORT file for GitHub (#6324)
Merge pull request 6324
2017-08-18 18:01:02 -04:00
jekyllbot
d08256d1ce Update history to reflect merge of #6321 [ci skip] 2017-08-18 13:20:39 -04:00
Frank Taillandier
72877a9b07 update links (#6321)
Merge pull request 6321
2017-08-18 13:20:37 -04:00
jekyllbot
22449496b8 Update history to reflect merge of #6311 [ci skip] 2017-08-18 12:46:56 -04:00
Antonio Argote
2321370119 trim plugins page, clarify intention of templates (#6311)
Merge pull request 6311
2017-08-18 12:46:54 -04:00
jekyllbot
02767d612e Update history to reflect merge of #6315 [ci skip] 2017-08-18 12:45:24 -04:00
Parker Moore
232ec4679a Allow yield to logger methods & bail early on no-op messages (#6315)
Merge pull request 6315
2017-08-18 12:45:23 -04:00
Parker Moore
08840946f3 Update history to reflect merge of #6320
[ci skip]
2017-08-18 12:42:58 -04:00
Parker Moore
b86785dc7c Merge pull request #6320 from jekyll/add-CODEOWNERS
Add CODEOWNERS file to help automate reviews.
2017-08-18 12:42:07 -04:00
Frank Taillandier
f2860047b7 /cc a team is now handled by CODEOWNERS 2017-08-18 18:20:24 +02:00
Frank Taillandier
f232e1039a move CODEOWNERS to .github 2017-08-18 18:18:34 +02:00
Parker Moore
22cc59905b Add CODEOWNERS file to help automate reviews.
Documentation from GitHub: https://help.github.com/articles/about-codeowners/

jekyllbot does too much already -- I'd like to see GitHub help us keep organized.
This is also an exercise in logically splitting up the codebase. The build team
is pretty overloaded it looks like -- can we split anything out?
2017-08-18 11:38:32 -04:00
jekyllbot
54c1e5515e Update history to reflect merge of #6318 [ci skip] 2017-08-18 11:09:36 -04:00
Aleksander Kuś
db4ab43bdb name unification (#6318)
Merge pull request 6318
2017-08-18 11:09:34 -04:00
jekyllbot
2ce17697d3 Update history to reflect merge of #6317 [ci skip] 2017-08-18 11:09:08 -04:00
Aleksander Kuś
9b6e85203a name unification (#6317)
Merge pull request 6317
2017-08-18 11:09:07 -04:00
Parker Moore
62c822e834 Utils::Rouge: add missing frozen_string_literal comment. 2017-08-17 22:19:53 -04:00
Parker Moore
8e9605a32c Update history note for #5919 2017-08-17 14:06:06 -04:00
jekyllbot
21fa0d7755 Update history to reflect merge of #5919 [ci skip] 2017-08-17 11:16:20 -04:00
Parker Moore
4c15b9e5e4 [WIP] Add shim that works for both Rouge 1 and Rouge 2 (#5919)
Merge pull request 5919
2017-08-17 11:16:18 -04:00
Parker Moore
6b8de2a757 3.5.2: thank the contributors 2017-08-12 16:42:53 -04:00
Parker Moore
07d4c36652 Add release post for v3.5.2 2017-08-12 16:36:29 -04:00
Parker Moore
97c0c6cc77 Update site for v3.5.2 2017-08-12 16:30:47 -04:00
Parker Moore
48fafd9fc0 Release 💎 3.5.2 2017-08-12 16:29:45 -04:00
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