742893410c
Merge pull request #3064 from ribbons/cygwin-env
2014-11-06 13:18:38 -08:00
c1aba46a1e
Release 💎 2.5.0
2014-11-06 12:59:52 -08:00
23712cf4dc
Update site with 2 new v2.5.0 PR's.
2014-11-06 12:07:21 -08:00
21de59a90e
Update history to reflect merge of #3067 [ci skip]
2014-11-06 12:05:28 -08:00
e11fb4d427
Merge pull request #3067 from jekyll/specify-log-level
2014-11-06 12:05:07 -08:00
328fbd83d4
Update history to reflect merge of #3066 [ci skip]
2014-11-06 12:04:31 -08:00
ffe7860625
Merge pull request #3066 from jekyll/catch-no-gemfile
2014-11-06 12:03:35 -08:00
5b54f78875
Allow users to specify the log level via JEKYLL_LOG_LEVEL.
2014-11-06 12:03:07 -08:00
989c70fe4a
In the case that a Gemfile does not exist, ensure Jekyll doesn't fail.
2014-11-06 10:48:09 -08:00
2f4448eab6
Merge pull request #3062 from jekyll/release-2-5-0
...
Release v2.5.0
2014-11-06 10:35:51 -08:00
90bdcaddb7
Add development dependencies for Cygwin
...
In the Cygwin environment, minitest and test-unit aren't bundled with
Ruby. Add these as explicit development dependencies when running under
Cygwin.
2014-11-06 09:28:52 +00:00
a0afa19e9a
Release 💎 v2.5.0
2014-11-05 22:07:23 -08:00
7918dad26f
Update history to reflect merge of #2865 [ci skip]
2014-11-05 22:03:06 -08:00
13bb7360c0
Merge pull request #2865 from jekyll/some-kind-of-bundler-thingy
2014-11-05 22:01:37 -08:00
5d23760280
Documentation for Bundler group.
2014-11-05 21:53:48 -08:00
5a350788e7
Test JEKYLL_NO_BUNDLER_REQUIRE.
2014-11-05 21:04:34 -08:00
e543fedf3f
Update history to reflect merge of #3065 [ci skip]
2014-11-05 20:49:27 -08:00
b02a5ba76a
Merge pull request #3065 from cllns/master
2014-11-05 20:49:05 -08:00
5a288e7de4
Add 'b' and 's' aliases for build and serve, respectively
2014-11-05 23:13:08 -05:00
8ee1b2a1fd
Finish up the plugin manager
...
And so it shall be.
2014-11-05 19:29:54 -08:00
b0a7f9c8c9
Require plugins from Gemfile :jekyll_plugins group.
2014-11-05 18:50:38 -08:00
519b60d012
Fix 2 syntax errors.
2014-11-05 18:39:54 -08:00
0ad2c338c4
Reorganize tests for plugins.
2014-11-05 18:39:54 -08:00
34de676713
Require gems in :jekyll_plugins group in a Gemfile in unsafe mode.
...
Replaces #1658 . /cc @imathis
2014-11-05 18:39:54 -08:00
01b11d098e
Update history to reflect merge of #3063 [ci skip]
2014-11-05 18:38:27 -08:00
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
Parker Moore
Matt Robinson
Sean Collins