d925dbca30
Merge branch 'yajl-ruby-2-4-patch'
...
* yajl-ruby-2-4-patch:
Depend on my branch of yajl-ruby with Ruby 2.4 Integer fix
2017-03-31 00:58:12 -04:00
0cf5310cf5
Merge branch 'ashmaroli-ruby-2.4.0'
...
* ashmaroli-ruby-2.4.0:
test with pygments 1.1 on all ruby versions
update rubygems version on travis
use compatible versions of gems
test against ruby-2.4.0
2017-03-31 00:57:40 -04:00
15e133f627
Depend on my branch of yajl-ruby with Ruby 2.4 Integer fix
...
/cc https://github.com/brianmario/yajl-ruby/pull/173
2017-03-31 00:56:15 -04:00
409c8f9f31
Make stackprof a ruby script [ci skip]
2017-03-31 00:50:00 -04:00
3921e523c5
Update history to reflect merge of #5995 [ci skip]
2017-03-30 22:02:05 -04:00
0d02a25b04
Default options for script/proof ( #5995 )
...
Merge pull request 5995
2017-03-30 22:02:04 -04:00
711a8483c6
travis: upgrade Ruby 2.2 and 2.1 to latest PATCH release
2017-03-30 20:14:04 -04:00
fe388a885e
Update history to reflect merge of #5994 [ci skip]
2017-03-30 17:00:33 -04:00
8325d56a1a
Fix broken link ( #5994 )
...
Merge pull request 5994
2017-03-30 17:00:31 -04:00
6edc546d36
Update history to reflect merge of #5985
...
[ci skip]
2017-03-28 18:39:30 -04:00
3688640d59
add /_data/*.tsv support ( #5985 )
...
* Update data.feature
- add .tsv
- add .csv with `\t`
- add .csv with `;`
* Fix Appveyor with dst-aware cucumber steps
* Check for given content in posts
* mention Ruby > 2.1.0 in docs
* Update history to reflect merge of #5983 [ci skip]
* Update history to reflect merge of #5961 [ci skip]
* Update data_reader.rb
- add .tsv support with tab separated columns
- not adding support for auto-detecting `:col_sep`
ftp://ftp.iana.org/assignments/media-types/text/tab-separated-values
https://www.ietf.org/rfc/rfc4180.txt (CSV)
https://ruby-doc.org/stdlib-2.4.1/libdoc/csv/rdoc/CSV.html
* Update data.feature
don't do semicolons and tabs in .csv within this patch
* Update data.feature
I don't know which component replaced my tab characters by space before.
* Update data.feature
t
* Update data_reader.rb
add a single space to satisfy format checker
2017-03-28 18:36:29 -04:00
73e70da9e5
Update history to reflect merge of #5989 [ci skip]
2017-03-28 11:35:45 -04:00
0b93d11cc6
Merge pull request #5989 from ashmaroli/fmt-fix
...
Merge pull request 5989
2017-03-28 11:35:44 -04:00
86703f1009
Use Rubocop v0.47.1 till we're ready for v0.48
2017-03-28 09:05:54 +05:30
f598b7e680
Update history to reflect merge of #5961 [ci skip]
2017-03-27 15:39:20 -04:00
e5317ced15
Merge pull request #5961 from ashmaroli/cucumber-win-fix
...
Merge pull request 5961
2017-03-27 15:39:18 -04:00
7affec2347
Update history to reflect merge of #5983 [ci skip]
2017-03-27 15:38:37 -04:00
99f5925cd3
Merge pull request #5983 from DirtyF/ruby-2.1
...
Merge pull request 5983
2017-03-27 15:38:36 -04:00
a2e82b7264
mention Ruby > 2.1.0 in docs
2017-03-27 20:47:55 +02:00
b367314424
Fix whitespace issue in philosophy document.
...
/cc https://github.com/jekyll/jekyll/issues/5342#issuecomment-247358296
2017-03-27 13:38:09 -04:00
a6518c1de3
Update history to reflect merge of #5792 [ci skip]
2017-03-27 13:08:00 -04:00
b91da2c904
Merge pull request #5792 from jekyll/philosophy
...
Document Jekyll's Philosophy
2017-03-27 13:04:03 -04:00
f2bf984160
Update philosophy document based on benbalter's feedback.
2017-03-27 13:03:42 -04:00
a9830fadac
Update history to reflect merge of #5952 [ci skip]
2017-03-25 06:16:03 -04:00
1f00d89e20
Merge pull request #5952 from tomjohnson1492/patch-19
...
Merge pull request 5952
2017-03-25 06:16:02 -04:00
01c95e85dd
Merge branch 'master' into patch-19
2017-03-24 17:27:01 -05:00
a3aed14d41
Update history to reflect merge of #5978 [ci skip]
2017-03-24 17:14:20 -04:00
a2a6cc0c6a
Merge pull request #5978 from jekyll/custom-404-tuts
...
Merge pull request 5978
2017-03-24 17:14:19 -04:00
990809ba07
Update history to reflect merge of #5946 [ci skip]
2017-03-24 16:21:38 -04:00
220335cef7
Merge pull request #5946 from ashmaroli/custom-404-tuts
...
Merge pull request 5946
2017-03-24 16:21:37 -04:00
3142f31a7a
add custom 404 to tutorial navigation
2017-03-24 21:19:54 +01:00
58dce4f099
Check for given content in posts
2017-03-23 10:10:38 +05:30
16e807a41d
Update history to reflect merge of #5965 [ci skip]
2017-03-22 11:28:40 -04:00
cba13d4026
Merge pull request #5965 from Kivlov84/patch-2
...
Merge pull request 5965
2017-03-22 11:28:39 -04:00
c48f147192
Update history to reflect merge of #5962 [ci skip]
2017-03-22 10:02:05 -04:00
af0051f19f
Merge pull request #5962 from Kivlov84/patch-1
...
Merge pull request 5962
2017-03-22 10:02:03 -04:00
b60b78cfc4
changed link references to names
2017-03-22 13:55:56 +01:00
c55cc1d9ef
Update history to reflect merge of #5971 [ci skip]
2017-03-21 15:34:57 -04:00
2c4eebc2ae
Merge pull request #5971 from tomjohnson1492/patch-21
...
Merge pull request 5971
2017-03-21 15:34:55 -04:00
fe6d4c7bea
updates from parkr's review
...
- removed "actually"
- switched code example to use `where`
2017-03-21 10:27:05 -07:00
161902eda2
Update history to reflect merge of #5949 [ci skip]
2017-03-21 12:26:06 -04:00
061aa40e9f
Merge pull request #5949 from lukebro/patch-1
...
Merge pull request 5949
2017-03-21 12:26:05 -04:00
f9243c5ab1
Included more details about adding defaults to static files
...
Based on the functionality released in [3.4.2](http://jekyllrb.com/news/2017/03/09/jekyll-3-4-2-released/ ) re adding defaults to static files, I thought this page needed some more detail.
2017-03-21 08:52:33 -07:00
351e3abd8e
Merge pull request #5969 from jekyll/release-3.4.3
...
Release post for v3.4.3
2017-03-21 11:24:49 -04:00
ca9d6be061
Release post for v3.4.3
2017-03-21 09:58:02 -05:00
eab83c3653
Update generated history for jekyllrb.com
2017-03-21 10:00:47 -04:00
9d66fc2292
Release 💎 3.4.3
2017-03-21 10:00:04 -04:00
df0d3f20c4
Fix some errant entries in History.markdown.
2017-03-21 09:58:26 -04:00
d592f5781a
Update history to reflect merge of #5957 [ci skip]
2017-03-21 09:12:18 -04:00
2907825f62
Merge pull request #5957 from jekyll/pull/escape_colon
...
Merge pull request 5957
2017-03-21 09:12:16 -04:00
Parker Moore
jekyllbot
Frank Taillandier
Tom Johnson
Christoph Päper
jekyllbot
Ashwin Maroli
Pat Hawks
Aleksander Kuś