dan
/
jekyll
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
1,052 Commits 2 Branches 2 Tags 21 MiB
Commit Graph

242 Commits

Author SHA1 Message Date
Parker Moore 17c875f6f5 Fixed plugin test error. 2013-03-02 18:51:42 +01:00
Parker Moore 63d0eef646 Merge pull request #824 from sinamt/symlinked_folders 
Allow symlinked folders in unsafe mode (with tests). Closes #796, resolves #233.
 2013-02-26 16:54:52 -08:00
Paul Leitmanis 849c34e913 Add tests for filtering symlink entries when safe mode enabled 2013-02-27 10:39:46 +11:00
Matt Rogers d58859570d Fix up the whitespace. 
Remove an extra blank line and fix another whitespace error pointed out
by git diff
 2013-02-25 13:24:37 -06:00
Matt Rogers ffc42310b4 Add back a test that was mistakenly removed. 2013-02-25 13:19:45 -06:00
Matt Rogers d2c79a8841 Merge branch 'master' into issue-653 2013-02-25 13:08:23 -06:00
Parker Moore f8a90d711f Using https protocol instead of http. 2013-02-24 01:54:13 +01:00
Parker Moore cdd3c0ef0c Remove 'type' attribute from script tag in gist liquid tag. 2013-02-24 01:30:41 +01:00
Parker Moore 7e7cee6e56 Strip space from the gist number, add test for gist tag 2013-02-24 00:58:13 +01:00
Parker Moore a19bb1815a Fixed merge conflicts in test/test_configuration.rb 2013-02-20 23:13:06 +01:00
Parker Moore c7c0a9432c Updating tests for safe_yaml. 2013-02-10 19:09:36 +01:00
Parker Moore 9bb0bfc0b2 Eliminating migrator tests (in this repo). 2013-01-31 01:19:56 +01:00
Parker Moore 2e73671cf4 Updated Kramdown tests to reflect numeral HTML entities. 2013-01-30 23:25:49 +01:00
Parker Moore 04b60ffe7f Merge pusewicz/bump-gems from #744 2013-01-30 23:20:23 +01:00
Parker Moore b4bea4a586 Merge branch 'code-cleanup' of git://github.com/tombell/jekyll into code-cleanup 
Module Cleanup

* 'code-cleanup' of git://github.com/tombell/jekyll:
  Remove new lines between module and class
  Update tag classes moving into a module
  Update pagination classes moving into a module
  Update converter classes moving into a module
  Strip extra newlines
  Update command classes moving into a module

Conflicts:
	lib/jekyll/commands/serve.rb
 2013-01-27 23:13:16 +01:00
Parker Moore 409eedafd8 Merge pull request #767 from mojombo/string-categories 
Force Categories to be Strings
 2013-01-26 13:32:26 -08:00
Ben Toews d82179048e adding files 2013-01-23 11:31:59 -06:00
Ben Toews 1528cfe1cd adding safe_yaml to protect against object instantiation from yaml 2013-01-23 11:30:24 -06:00
Parker Moore 607b4c84fd Only running simplecov if RUBY_VERSION is 1.9 or greater, and COVERAGE env is set to 'true' 2013-01-20 22:16:23 -05:00
Tom Bell 2c45150545 Update tag classes moving into a module 2013-01-19 23:50:44 +00:00
Tom Bell 663a1321d2 Update converter classes moving into a module 2013-01-19 23:07:38 +00:00
Parker Moore f231ef7644 Merge pull request #684 from mattr-/issue-680. 2013-01-18 10:28:14 -05:00
Parker Moore ce798a5956 Added test for all-String categories. 2013-01-17 21:57:21 -05:00
Matt Rogers 5e08cddb98 filter out test files in coverage results 2013-01-16 22:27:23 -06:00
Matt Rogers 00d74fa53f Add SimpleCov to the unit tests 2013-01-16 22:20:34 -06:00
Matt Rogers f460a6cf71 Merge branch 'master' into issue-653 2013-01-16 21:52:32 -06:00
Parker Moore e383bfe65d Merge pull request #743 from mccxj/master 
add glob support to include, exclude option
 2013-01-12 22:16:07 -08:00
Parker Moore 5a3e05dbff Ensuring that layout is only set to the default value if layout is not specified 2013-01-12 15:31:14 -08:00
Parker Moore e2affb2257 Added passing tests for #616 2013-01-12 00:14:00 -08:00
Parker Moore a05b9159d9 Merge pull request #616 from hokaccha/fix_pygments_opt 
fixed pygments linenos options for pygments.rb
 2013-01-12 00:11:18 -08:00
Parker Moore d2e750cc74 removed extraneous whitespace in test_site.rb 2013-01-11 15:54:57 -08:00
edeustace 0fa55418e9 merge lastest from mojombo/jekyll master 2013-01-11 12:23:53 +01:00
Piotr Usewicz 9b8b5b2bda Dont test kramdown 
It should have it's own tests for that
 2013-01-11 11:02:07 +00:00
mccxj 660e5e0e14 Merge remote-tracking branch 'jekyll/master' 2013-01-11 15:45:54 +08:00
mccxj 3cf29eeee2 add Enumerable#glob_include? 2013-01-11 15:33:11 +08:00
Matt Rogers 92eb926bf8 Look for plugins under the source directory by default 2013-01-10 21:24:28 -06:00
Eric Theise a5c908ac3f no good reason for making 'name' an instance variable 2013-01-10 14:13:11 -08:00
Eric Theise cf42c56630 stick to good coding standards 2013-01-10 14:07:10 -08:00
Eric Theise 3e7f00ae19 test the path, not the parts 2013-01-10 13:01:50 -08:00
Piotr Usewicz 5d48c5390d Add test/unit 2013-01-10 20:47:55 +00:00
Eric Theise ba48870ead outputting full path when file does not parse 2013-01-10 12:29:04 -08:00
xiaojian cai adba101734 update test for include,exclude glob support 2013-01-09 16:44:53 +08:00
xiaojian cai 655cf3b3a8 Update test/test_site.rb 2013-01-09 16:23:58 +08:00
edeustace 6eed91871f Changes based on @mojombo's feedback 2013-01-08 23:17:06 +01:00
stereobooster da096f307b Add testcases for YAML syntax error and non UTF-8 encoding 2012-12-30 02:39:02 +02:00
Tom Preston-Werner c23302f4fa Merge branch 'deletion_protection' of https://github.com/jasonroelofs/jekyll into jasonroelofs-deletion_protection 2012-12-26 14:02:41 -07:00
Tom Preston-Werner 3a8ebb4b71 Merge branch 'fix/front-matter-regexp' of https://github.com/zimbatm/jekyll into zimbatm-fix/front-matter-regexp 2012-12-15 22:09:41 -08:00
Tom Preston-Werner 0b62b37122 Remove newline to fix failing Redcarpet test. 2012-12-15 16:34:32 -08:00
Matt Rogers 8fb4e8fcca Convert slashes in titles to dashes when migrating from WordPress 
When a post has a title that contains a slash, such as 'This is my cool
blog post part 1/2', convert the slash to a dash so that the post
filename is created correctly.

Fixes issue #680
 2012-12-04 20:45:20 -06:00
edeustace 7c800d3b07 Added a configuration variable: keep_files (default: ['.git']), based on this pull request: https://github.com/mojombo/jekyll/pull/556 2012-08-23 12:07:30 +02:00