60202782ea
Only try bundler if the Gemfile is there.
2014-11-16 21:21:50 -08:00
32b14d6402
First, setup Bundler. Then, require it.
...
Per a conversation in
https://github.com/bundler/bundler/issues/3252#issuecomment-63208769
2014-11-16 21:18:23 -08:00
687b9cdf19
Merge pull request #3058 from alfredxing/fix-post-url-equality
2014-11-16 20:19:37 -08:00
314fb875b5
Merge pull request #3089 from jekyll/remove-duplication-in-regexp
2014-11-12 18:46:44 -08:00
d4c15efff9
Cache name matching regex
2014-11-11 17:35:09 -08:00
06750b8502
Print error message in renderer
2014-11-10 11:45:56 -08:00
bd907c5be6
Remove duplicate regexp phrase: ^\A.
...
Addresses @mastahyeti's comment in #3077 : https://github.com/jekyll/jekyll/pull/3077#discussion_r20077150
2014-11-10 11:36:05 -08:00
84cef2202d
Remove duplicate 'Conversion error:' message
2014-11-10 09:12:51 -08:00
eaa132c65b
Fall back to old method with deprecation warning
2014-11-09 11:55:47 -08:00
22d11bef2d
Prepare a 💎 v2.5.1 release.
2014-11-08 22:29:47 -08:00
067f8b6be7
Strip the drive name from both paths when checking the prefix.
2014-11-08 13:10:28 -08:00
e11fb4d427
Merge pull request #3067 from jekyll/specify-log-level
2014-11-06 12:05:07 -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
a0afa19e9a
Release 💎 v2.5.0
2014-11-05 22:07:23 -08:00
13bb7360c0
Merge pull request #2865 from jekyll/some-kind-of-bundler-thingy
2014-11-05 22:01:37 -08:00
5a350788e7
Test JEKYLL_NO_BUNDLER_REQUIRE.
2014-11-05 21:04:34 -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
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
9a15a09028
Add {{ | jsonify }} support for hashes.
2014-11-05 11:37:34 -08:00
50d0fc3c85
Match post.name instead of slugs and dates
2014-11-04 16:13:04 -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
4bccbdead4
If no overrides are passed in, just default to a Hash.
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
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
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
ccd1941378
Merge pull request #3053 from alfredxing/fix-serve-host
2014-11-03 12:09:34 -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
f9e249ae20
Generalize Utils#slugify for any scripts
...
It replaces any non alphanumeric glyphs by an hyphen.
2014-10-31 15:56:03 +01: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
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
ae01b1d5df
😦
2014-10-22 02:16:50 -07:00
5cb0aee251
Have to go back on all these...
2014-10-22 02:10:21 -07:00
2eb318a929
Replace costly Hash#fetch with arity=2 with arity=1 + block.
2014-10-22 01:43:46 -07:00
0511ece2f5
Use String#<< instead of String#+=
...
I just couldn’t believe this but look:
~/jekyll/jekyll#master$ ruby benchmark/string-concat
Calculating -------------------------------------
+= 6367 i/100ms
<< 128697 i/100ms
-------------------------------------------------
+= 1704.3 (±0.6%) i/s - 12734 in 7.472170s
<< 4381212.4 (±6.3%) i/s - 21878490 in 5.014899s
WOW.
2014-10-22 00:58:20 -07:00
1395d5686b
Optimize more URL#sanitize_url
2014-10-22 00:57:53 -07:00
3227c4ecea
Use #tr instead of #gsub
2014-10-22 00:57:25 -07:00
b9c4fc93d7
Use flat_map instead of map.flatten
2014-10-22 00:57:06 -07:00
9cc3085dd0
Turn on FancyIndexing.
2014-10-20 21:23:30 -07:00
5b37ad57cc
If `--verbose` is given, debug the sh*t out of that.
2014-10-20 21:23:22 -07:00
3dedcbf894
Sort webrick_options
2014-10-20 21:23:00 -07:00
7fd9f102c0
Merge pull request #2997 from jekyll/utils-slugify
2014-10-20 20:11:04 -07:00
5ed4638400
Merge pull request #2986 from tamagokun/where_filters_enumerable
2014-10-20 20:09:21 -07:00
68c0e8f847
Hash#each_key instead of Hash#keys.each. Faster code.
2014-10-20 10:10:29 -02:00
078b2785e4
Revert "Make permalink parsing consistent with pages"
2014-10-18 12:07:44 -07:00
9f5835871b
Utils.slugify: Don't create new objects when gsubbing
2014-10-12 16:18:40 -07:00
00d29e7e77
Merge pull request #2994 from jekyll/fixes-from-benchmarking
2014-10-12 15:49:20 -07:00
b564214535
Pass the context on to IncludeRelativeTag#page_path
2014-10-12 15:16:38 -07:00
63a6d595c4
Fix feed link to respect baseurl
2014-10-12 23:14:41 +01:00
626706c8c5
Cache the `@includes_dir` in each instance so the method isn't called all the time
2014-10-12 15:11:28 -07:00
4942b2947b
Only compile the Converter#matches regexp when asked for
2014-10-12 14:31:49 -07:00
fbe98df488
Cache variables that won't change through the life of an object
2014-10-12 14:06:17 -07:00
44c9f81921
Cache the extname regexp in Converters::Markdown and Textile
2014-10-12 14:06:16 -07:00
3994d9116d
Link atom feed from html head
...
This makes it possible for browsers to autodiscover the feed. Fixes https://github.com/jekyll/jekyll/issues/2995
2014-10-12 20:09:14 +01:00
46e76bde3f
Add mode parameter to slugify Liquid filter
2014-10-12 02:44:58 +09:00
f6ea8b4d50
Allow Enumerables to be used with "where" filter.
2014-10-08 16:19:55 -04:00
b0c0fbd70b
site_template/feed.xml: Remove unneeded space.
2014-10-08 10:37:01 +03:00
28bb15d4ee
site_template/_includes/head.html: Minor refactoring.
...
Remove unneeded end tag, and also strip newlines.
Move `X-UA-Compatible` just after `meta charset`.
2014-10-08 10:33:39 +03:00
f0e22be32b
Merge pull request #2972 from tkrotoff/wrapper-width-hardcoded
2014-10-05 19:23:49 -07:00
1ccd2156c5
Fix head.html indentation
2014-10-05 18:53:53 +02:00
8e481cdf8e
New Sass variable $content-width instead of hardcoded value
2014-10-05 18:49:39 +02:00
42a8dba642
Page specific descriptions
2014-09-30 22:17:49 +01:00
0701fa7b16
Update outdated comment
...
incorrect as of 6 Aug 2014.
2014-09-26 19:49:58 -04:00
3a96d01e4a
Make permalink parsing consistent with pages
...
Require permalink to end in a slash to write an index file.
Addresses #2920 .
2014-09-24 22:08:25 -07:00
bd0eebdb05
Merge pull request #2925 from pathawks/htm-extension
2014-09-24 17:08:02 -07:00
dc0add15af
Merge pull request #2946 from kleinfreund/patch-1
2014-09-24 17:06:53 -07:00
e6f89074d4
Rouge's Redcarpet plugin now has a different API
...
See for more:
- 18ec938e9chttps://github.com/jneen/rouge/issues/182
2014-09-22 23:03:49 -07:00
e013c16ba9
Fix code example for media query mixin
...
It was using an old variable name (`$palm`) instead of the current one (`$on-paln`).
2014-09-22 08:18:14 +02:00
fdf58c5ce2
Allow per post permalinks to end in `.htm`
...
Fixes #2920
2014-09-14 11:58:16 -07:00
566eb6ef3b
remove watch since it default in 2.4.0
2014-09-14 11:28:29 +08:00
c3ec158f2d
Keep backwards compatibility
...
Re-add `relative_path` Liquid variable too keep compatibility
2014-09-11 18:25:21 -07:00
6c0e791236
Use relative path for `path` Liquid variable in Documents
2014-09-10 21:04:40 -07:00
e72f8cf5b1
Release 💎 2.4.0
2014-09-09 22:24:09 -07:00
196a56e3ec
Add push, pop, shift, and unshift Liquid filters.
...
Fixes #2892 .
2014-09-09 21:29:23 -07:00
4fb6e1cde9
Merge pull request #2884 from gjtorikian/improve-docs-for-include-relative
2014-09-09 00:21:42 -07:00
06c9b1b33c
Fixing "vertycal" typo
...
s/vertycal/vertical
Unless, like, "vertycal" was on purpose or something.
2014-09-08 22:48:23 -07:00
deb4e0d24a
Set tag name as ivar
...
This lets us use just one syntax_example method for both classes.
2014-09-08 14:27:51 -07:00
0675f2a423
Update include_relative tests
...
This verifies you can’t go “up” in the include
2014-09-07 21:23:45 -07:00
6644c77d23
Merge pull request #2870 from gjtorikian/support-relative-include
2014-09-07 13:05:38 -07:00
a569799ffc
Sanitize the resolved includes path
2014-09-07 12:18:54 -07:00
3668437c96
Rename method to `resolved_includes_dir`
2014-09-07 12:18:35 -07:00
4da07bb2c3
Add tests around nasty include attempts
2014-09-07 12:00:37 -07:00
0e4549013d
Define methods for shared vars between include & include_relative
2014-09-07 11:21:40 -07:00
394eab4a3a
Add the slugify Liquid filter
2014-09-07 16:48:57 +09:00
9f558d1cec
Rename tag to `include_relative`
2014-09-06 21:48:15 -07:00
787bb582da
Trash the subclass
2014-09-06 21:48:00 -07:00
58a76911bb
Merge pull request #2864 from kansaichris/add-title-to-collection-urls
2014-09-05 10:04:38 -07:00
aa97f1025d
Support a new `relative_include` tag
2014-09-03 15:43:51 -07:00
4adc35aaf3
Revise Utils#slugify with inspiration from Rails
2014-09-02 14:32:14 +09:00
702b39dec5
Replace the 'name' parameter with 'string'
2014-09-02 13:34:44 +09:00
3ca1245027
Move Document#sluggify to Utils#slugify
2014-09-02 13:29:28 +09:00
cfd17b2e7d
Add inspect filter
2014-09-01 14:51:09 -07:00
05d65f0341
Rename 'slug' to 'sluggify' and clean up code
2014-09-01 16:25:42 +09:00
a5e51cfdbe
Properly handle titles with trailing punctuation
2014-09-01 13:25:38 +09:00
cca9c50c26
Add 'title' to url_placeholders
2014-09-01 12:53:31 +09:00
bcb6798838
Pass the filename as an argument to Document#slug
2014-09-01 12:45:41 +09:00
9e9f4f1c53
Fix orientation bugs
...
Maintain fontsize and and adapt width when switching to landscape mode.
2014-08-31 15:27:51 +02:00
081e34a5ab
Merge pull request #2858 from jekyll/auto-enable-watch
2014-08-31 00:05:42 -07:00
b5dbc36975
Use Jekyll.sanitized_path when adding static files to Collections.
...
h/t @benbalter https://github.com/jekyll/jekyll/pull/2737#discussion_r16713423
Not sure if the previous code can be exploited, but being super safe is never a bad thing.
2014-08-30 23:09:47 -07:00
6cee2a87cc
Auto-enable watch on 'serve'.
...
Addresses @kneath's and @chibicode's comments in #2695 .
2014-08-30 22:52:41 -07:00
eea5921856
Fix test for Liquid rendering in Sass.
2014-08-30 21:54:50 -07:00
190ab7f6b8
Merge pull request #2830 from kansaichris/render-liquid-in-coffeescript
2014-08-28 19:35:44 -07:00
d395183ee2
refactored where filter comment
2014-08-28 22:46:53 +03:00
79992fc3c8
Fix inaccurate comments
2014-08-26 17:17:13 +09:00
71b10e2d4a
Make render_with_liquid? true for CoffeeScript
2014-08-26 17:14:33 +09:00
56cd73eb35
Merge pull request #2799 from kansaichris/add-title-to-collection-permalinks
2014-08-25 23:15:23 -07:00
a72706ace6
Add Document#slug
2014-08-26 11:46:01 +09:00
cc4a0d1704
Change :title to :name
2014-08-26 11:26:19 +09:00
d9da7cbd76
add class << self idiom to new command
2014-08-25 10:59:58 +04:00
e8b00fb6f2
Add the 'title' variable to collection permalinks
2014-08-23 14:50:55 +09:00
3b7091aab7
Find variables in _config.yaml by searching with relative file path.
2014-08-20 00:07:51 +02:00
9df020f7e9
add .sass-cache to .gitignore and fix main.scss fileformat
2014-08-19 17:39:22 +08:00
cccfda7de8
hashrockets in CSV loading
2014-08-17 08:34:38 +01:00
866935dadf
map with proc for CSV loading
2014-08-16 20:26:29 +01:00
687176e22c
Autoload csv files from data directory
2014-08-16 14:54:14 +01:00
1f877fde1e
Make the intro text on the site template post a bit nicer.
2014-08-13 01:27:36 -04:00
d70f9d4a29
Layout for site template feed.xml should be 'null'.
2014-08-13 01:23:19 -04:00
4d8e335da1
The mighty classifier --- reborn!!!!!
...
Use classifier-reborn v2.0 in place of classifier 1.3.
Code at https://github.com/jekyll/classifier-reborn
2014-08-13 00:29:40 -04:00
9738ea452f
Merge pull request #2723 from jekyll/release-2-3-0
2014-08-13 00:04:15 -04:00
566d3718b0
added sassify and scssify filters fot converting sass and scss strings to css
2014-08-12 21:24:04 -06:00
10cc45fc45
Add StaticFile#destination_rel_dir
2014-08-12 18:07:13 -04:00
530e049d2d
Read in static files info `collection.files` as `StaticFile`s.
2014-08-12 15:59:45 -04:00
f16a5cbae1
Add Utils.has_yaml_header? so we can check the front matter existence in one place
2014-08-12 15:58:02 -04:00
7b1763a124
Release 💎 v2.3.0
2014-08-12 14:39:21 -04:00
eabde41267
Merge pull request #2733 from jekyll/sass-in-liquid
2014-08-12 14:36:15 -04:00
707278f099
Use the proper extname getter.
2014-08-12 14:11:27 -04:00
ba63a2c6d1
Merge pull request #2731 from jekyll/doc-to_s
2014-08-12 13:47:32 -04:00
8ff9074ce5
Allow Sass files to be rendered, but never place them in layouts.
...
Fixes #2573 .
2014-08-12 13:38:53 -04:00
db34c48927
Just like for Convertible, place the un-layouted content in document.content.
2014-08-12 12:52:38 -04:00
Parker Moore
Alfred Xing
Sean Collins
Veres Lajos
Renaud Martinet
Glauco Custódio
Matt Hickford
nitoyon
Mike Kruk
XhmikosR
Tanguy Krotoff
Seth Warburton
feivel
Philipp Rudloff
Pat Hawks
Igor Kapkov
Peter deHaan
Garen Torikian
Parker Moore
Chris Frederick
Shu Uesugi
Michael Kühnel
Faruk AYDIN
Ruslan Korolev
Kamil Dziemianowicz
Gordon Gao
James Smith
Kevin