1b68a29f29
Merge pull request #3063 from jekyll/jsonify-on-hashes
2014-11-05 18:37:26 -08:00
18930b01f6
Fix up the assertions.
2014-11-05 11:39:15 -08:00
b29fd6d380
Add tests.
...
Need to fix up the assertions to match the output.
2014-11-05 11:37:51 -08:00
9a15a09028
Add {{ | jsonify }} support for hashes.
2014-11-05 11:37:34 -08:00
774c65a869
Add a rake site:generate command and use Ruby instead of a subprocess.
2014-11-05 11:13:04 -08:00
a822219086
Update history to reflect merge of #2882 [ci skip]
2014-11-05 10:22:28 -08:00
2ec1dc1831
Merge pull request #2882 from jekyll/security/centralize-path-sanitation
2014-11-05 10:21:57 -08:00
90cddade53
Commit the paths one by one to Jekyll.sanitized_path with the proper initial base.
...
Prevents errors like these:
[39/78] TestPost#test_: A Post processing posts should not be writable outside of destination. /Users/parker/jekyll/jekyll/test/dest
/Users/parker/jekyll/jekyll/test/dest/Users/parker/jekyll/baddie.html
= 0.01 s
1) Failure:
TestPost#test_: A Post processing posts should not be writable outside of destination. [/Users/parker/jekyll/jekyll/test/test_post.rb:152]:
Failed assertion, no message given.
2014-11-03 22:27:55 -08:00
2ee8d690c4
More conversion of Jekyll.sanitized_path ~> site.in_(source|dest)_dir
2014-11-03 22:16:48 -08:00
ca40c771d0
Only allow CWD _layouts outside of safe mode.
2014-11-03 22:16:48 -08:00
0c6137b2d3
Fix site tests.
2014-11-03 22:16:48 -08:00
4bccbdead4
If no overrides are passed in, just default to a Hash.
2014-11-03 22:16:48 -08:00
8d02c5cd94
Allow override of `destination` in site_configuration in tests
2014-11-03 22:16:48 -08:00
68e9c84a18
Flatten paths sent into `#in_dest_dir`
2014-11-03 22:16:48 -08:00
f7b1782294
Fix post.rb permalink stuff in light of merge of #2925 .
2014-11-03 22:16:48 -08:00
2690c045ec
Fix the tests so they are *PERFECT*.
2014-11-03 22:16:48 -08:00
656e772388
Cache the related posts most_recent_posts
...
/cc @mattr- is this safe to do, you think? it only happens at render
time...
2014-11-03 22:16:47 -08:00
817f6cb658
Fix problem where entries weren't stripped of their trailing slashes.
2014-11-03 22:16:47 -08:00
179b5ab193
Use site.in_source_dir as @mastahyeti suggested
2014-11-03 22:16:47 -08:00
b4a2788626
Just swallow it if there is no content for the excerpt to parse.
2014-11-03 22:16:47 -08:00
3762878381
Correctly access the StaticFile's site variable.
2014-11-03 22:16:47 -08:00
9cbc24fce5
More safety. 🔒
2014-11-03 22:16:47 -08:00
4078bde3ba
More passing tests.
2014-11-03 22:15:41 -08:00
3b634134a0
Another test passing. 😄
2014-11-03 22:15:41 -08:00
461e16f8bc
More tests are passing. Hooray.
2014-11-03 22:15:40 -08:00
0bc88975c8
More removal of File.join
2014-11-03 22:15:40 -08:00
98182aab4a
Use site.in_source_dir in Collection.
2014-11-03 22:15:40 -08:00
3a3be7e5a7
Add Site#in_dest_dir
2014-11-03 22:15:40 -08:00
7e1cc4b684
Add Site#in_source_dir
2014-11-03 22:15:40 -08:00
0f2a3a606b
Append the site to Jekyll.sites upon creation
2014-11-03 22:15:40 -08:00
314dce62cf
Make Site.source and Site.dest "immutable"
2014-11-03 22:15:40 -08:00
bd72265e74
Reformat the Jekyll module's static methods.
2014-11-03 22:15:40 -08:00
ab8441259e
Update history to reflect merge of #3053 [ci skip]
2014-11-03 12:10:18 -08:00
ccd1941378
Merge pull request #3053 from alfredxing/fix-serve-host
2014-11-03 12:09:34 -08:00
4272537f69
Update history to reflect merge of #3052 [ci skip]
2014-11-03 12:01:02 -08:00
23f4c5804c
Merge pull request #3052 from vlajos/typofixes20141102
2014-11-03 12:00:02 -08:00
a16dfef840
Use 127.0.0.1 as host instead of 0.0.0.0
2014-11-02 15:31:23 -08:00
e1f7139b9c
typo fixes
2014-11-02 23:00:09 +00:00
81f4abdbcd
Update history to reflect merge of #3040 [ci skip]
2014-10-30 09:37:24 -07:00
9a82b474aa
Merge pull request #3040 from mitaa/master
2014-10-30 09:35:47 -07:00
57ca3a04d5
Update continuous-integration.md
...
Fix miswording
2014-10-30 10:05:19 +01:00
257f852b96
Update history to reflect merge of #3031 [ci skip]
2014-10-29 15:13:51 -07:00
8dcf7a6680
Merge pull request #3031 from alfredxing/frontmatter-permalinks
2014-10-29 15:13:12 -07:00
02e53fb6ff
Implement @parkr's suggestions
2014-10-27 22:59:15 -07:00
485f7634bd
Update history to reflect merge of #3032 [ci skip]
2014-10-27 17:40:30 -07:00
0fc256dbef
Merge pull request #3032 from jekyll/jsonify-deeply
2014-10-27 17:40:05 -07:00
3fb1356593
The jsonify filter should deep-convert to Liquid when given an Array.
...
Fixes https://github.com/github/choosealicense.com/issues/225
2014-10-27 15:58:42 -07:00
cd9d38c5ea
Remove duplicate code
2014-10-26 21:38:19 -07:00
0fe1d0686a
Allow placeholders in permalinks
2014-10-26 18:23:58 -07:00
4e8ebd999a
Update history to reflect merge of #3022 [ci skip]
2014-10-24 11:35:22 -07:00
Parker Moore
Alfred Xing
Veres Lajos
mitaa