github/jekyll
1
1
Fork 0
mirror of https://github.com/jekyll/jekyll.git synced 2026-01-29 00:38:03 -05:00
Code Issues Packages Projects Releases Wiki Activity
7,526 Commits 60 Branches 160 Tags
549371fd4ecd9dbff193dc5c19b047938d27eeb2
Commit Graph

7526 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
jekyllbot
549371fd4e Merge pull request #5030 from ayastreb/document-stylefix 
Merge pull request 5030
 2016-06-27 09:48:46 -07:00
Anatoliy Yastreb
8154eb40aa rubocop: separate deprecator error messages 2016-06-26 16:43:56 +02:00
jekyllbot
390c98045c Update history to reflect merge of #5031 [ci skip] 2016-06-25 14:47:30 -07:00
jekyllbot
cdee574782 Merge pull request #5031 from ayastreb/convertible-stylefix 
Merge pull request 5031
 2016-06-25 14:47:29 -07:00
jekyllbot
6ddd64d4c4 Update history to reflect merge of #5032 [ci skip] 2016-06-25 14:46:32 -07:00
jekyllbot
1c71b5939f Merge pull request #5032 from ayastreb/renderer-stylefix 
Merge pull request 5032
 2016-06-25 14:46:32 -07:00
Anatoliy Yastreb
3ccc91430f rubocop: fix code style 2016-06-25 15:22:36 +03:00
Anatoliy Yastreb
2bbad7cb43 rubocop: fix code style 2016-06-25 15:11:50 +03:00
Anatoliy Yastreb
b156aa912a rubocop: fix code style 2016-06-25 14:56:12 +03:00
jekyllbot
6dd3cc21c4 Update history to reflect merge of #5024 [ci skip] 2016-06-23 18:48:25 -07:00
jekyllbot
205acb0916 Merge pull request #5024 from ayastreb/configuration 
Merge pull request 5024
 2016-06-23 18:48:25 -07:00
jekyllbot
5312e85478 Update history to reflect merge of #5025 [ci skip] 2016-06-23 09:32:14 -07:00
jekyllbot
d093c76d35 Merge pull request #5025 from ayastreb/regenerator 
Merge pull request 5025
 2016-06-23 09:32:13 -07:00
Parker Moore
9278eb8fce utils: check that the object is a hash when merging default_proc 
Follow-up to #5026.
 2016-06-22 12:15:07 -07:00
jekyllbot
357e3621e2 Update history to reflect merge of #5026 [ci skip] 2016-06-22 10:05:59 -07:00
jekyllbot
6358a8f92c Merge pull request #5026 from ayastreb/utils 
Merge pull request 5026
 2016-06-22 10:05:59 -07:00
Anatoliy Yastreb
0b169f7739 rubocop: refactor modified? method 2016-06-22 14:15:13 +03:00
Parker Moore
b539c32364 Add a benchmark for capture vs. assign in Liquid. [ci skip] 2016-06-21 14:20:18 -07:00
jekyllbot
1779aa681a Update history to reflect merge of #5027 [ci skip] 2016-06-21 10:57:15 -07:00
jekyllbot
fdd282cb75 Merge pull request #5027 from sondr3/add-plugin-generator-jekyllized 
Merge pull request 5027
 2016-06-21 10:57:14 -07:00
Sondre Nilsen
f6f0f483bf Add generator-jekyllized to third party plugins 2016-06-21 19:40:22 +02:00
Anatoliy Yastreb
08b883b268 rubocop: fix code style 2016-06-20 16:03:42 +03:00
Anatoliy Yastreb
d13112dbdc rubocop: fix code style 2016-06-19 18:22:59 +03:00
Anatoliy Yastreb
14e857029a rubocop: fix code style 2016-06-19 15:48:23 +03:00
jekyllbot
902f344a50 Update history to reflect merge of #5019 [ci skip] 2016-06-17 19:42:28 -07:00
jekyllbot
5c03e1da3f Merge pull request #5019 from ayastreb/static_file 
Merge pull request 5019
 2016-06-17 19:42:28 -07:00
Anatoliy Yastreb
97fecafff5 rubocop: revert changes in test 2016-06-17 13:06:11 +03:00
jekyllbot
b06cfb9c50 Update history to reflect merge of #4922 [ci skip] 2016-06-16 17:31:54 -07:00
jekyllbot
7ee99bcd38 Merge pull request #4922 from jekyll/jekyll-new-use-theme 
Merge pull request 4922
 2016-06-16 17:31:53 -07:00
Anatoliy Yastreb
0f74db4131 rubocop: move mtimes cache hash to class variable 2016-06-16 23:12:01 +03:00
Anatoliy Yastreb
7a933893db rubocop: fix code style 2016-06-16 13:14:50 +03:00
Parker Moore
c70ca8ac97 Whoops, forgot the _layouts templates. 2016-06-15 16:04:57 -07:00
Parker Moore
765a23468e Give the user a layout scaffolding. 2016-06-15 15:59:31 -07:00
jekyllbot
e9fed13392 Update history to reflect merge of #5018 [ci skip] 2016-06-15 14:58:53 -07:00
jekyllbot
a07917a7b2 Merge pull request #5018 from DirtyF/rubocop-command 
Merge pull request 5018
 2016-06-15 14:58:53 -07:00
DirtyF
f27fa75935 remove lib/jekyll/command.rb from exclude 2016-06-15 23:54:05 +02:00
jekyllbot
7c381c931b Update history to reflect merge of #5017 [ci skip] 2016-06-15 14:36:22 -07:00
jekyllbot
8fd287edba Merge pull request #5017 from DirtyF/rubocop-exe 
Merge pull request 5017
 2016-06-15 14:36:21 -07:00
DirtyF
20910976c4 remove unecessary slashes 2016-06-15 23:00:16 +02:00
DirtyF
b972daa54d apply @envygeeks recommandation 2016-06-15 22:31:08 +02:00
DirtyF
c3313d868e fix rubocop offenses in exe/jekyll 2016-06-15 22:22:57 +02:00
Jordon Bedwell
a9666bf1c7 It's official. It's macOS not "MacOS" or "Mac OS" anymore. 2016-06-15 14:54:09 -05:00
Parker Moore
1dbcf97bef Fix rubocop offense. 2016-06-15 12:50:54 -07:00
jekyllbot
499b83236c Update history to reflect merge of #5014 [ci skip] 2016-06-15 12:42:08 -07:00
jekyllbot
6239bca6e6 Merge pull request #5014 from jekyll/exe 
Merge pull request 5014
 2016-06-15 12:42:08 -07:00
Parker Moore
3a1ac37ed1 Exclude exe/jekyll from rubocop for now. 2016-06-15 12:26:01 -07:00
Parker Moore
6cf6da04af features: change jekyll bin path to use exe/jekyll 2016-06-15 12:12:44 -07:00
Parker Moore
5e343f620a Move bin/jekyll to exe/jekyll to prevent collision with binstubs 2016-06-15 11:11:22 -07:00
Parker Moore
ddf833505c Fix offense. 2016-06-15 10:33:30 -07:00
jekyllbot
4a2b96293b Update history to reflect merge of #5009 [ci skip] 2016-06-15 10:04:37 -07:00