Commit Graph

925 Commits

Author SHA1 Message Date
Tom Preston-Werner
568208ca9b Update history to reflect merge of #765. 2013-01-17 12:25:45 -08:00
Tom Preston-Werner
733587fa05 Merge pull request #765 from mattr-/fix-coverage
Fix coverage
2013-01-17 12:22:58 -08:00
Matt Rogers
5e08cddb98 filter out test files in coverage results 2013-01-16 22:27:23 -06:00
Matt Rogers
79fceedab3 add the coverage directory to .gitignore 2013-01-16 22:22:33 -06:00
Matt Rogers
00d74fa53f Add SimpleCov to the unit tests 2013-01-16 22:20:34 -06:00
Matt Rogers
06a6b8aadb Add simplecov as a dependency
Simplecov works with Ruby 1.9.x for generating test coverage
2013-01-16 22:18:10 -06:00
Matt Rogers
9007f9c851 Remove the coverage rake task
RCov does not work on Ruby 1.9.x
2013-01-16 22:15:45 -06:00
Parker Moore
8b83feac06 Update history to reflect merge of #664 2013-01-16 21:36:48 -05:00
Parker Moore
8fb36ab064 Merge branch 'master' of github.com:mojombo/jekyll
* 'master' of github.com:mojombo/jekyll:
  Slight stylistic tweak to LSI initialisation.
  faster_lsi: Massively accelerate LSI performance.
2013-01-16 21:36:07 -05:00
Parker Moore
faf5e44c47 Merge pull request #664 from Jashank/faster_lsi
faster_lsi: Massively accelerate LSI performance.
2013-01-16 18:36:01 -08:00
Parker Moore
cbbf8b496d Update history to reflect merge of 496 2013-01-16 21:35:12 -05:00
Parker Moore
2e76edd837 Merge pull request #496 from dunsmoreb/issue/481
Truncate post slugs when importing from Tumblr.
2013-01-16 18:34:21 -08:00
Parker Moore
5848476960 Merge pull request #751 from mojombo/new-cmds-docs
Documentation for new command structure & opts
2013-01-16 16:43:38 -08:00
Parker Moore
a017f36d4b Added description to History file 2013-01-15 15:03:52 -08:00
Parker Moore
c0a6e1e5a2 Changed 'six' to 'some' on Sites page 2013-01-15 14:56:04 -08:00
Parker Moore
070f5111e1 A link to the sites page on the wiki (in addition to this curated list) 2013-01-15 14:44:06 -08:00
Parker Moore
282a3bce73 Updated history 2013-01-12 22:26:05 -08:00
Parker Moore
6a7a030eee Fixed failing Cucumber test 2013-01-12 22:25:55 -08:00
Parker Moore
963721fb46 Merge branch 'master' of github.com:mojombo/jekyll
* 'master' of github.com:mojombo/jekyll:
  add Enumerable#glob_include?
  fixed a syntax error
  use any? instead
  update test for include,exclude glob support
  Update test/test_site.rb
  Update lib/jekyll/site.rb
  add regexp support for option 'include','exclude'
2013-01-12 22:16:28 -08: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
fbda85210a Added html_report profile to cucumber 2013-01-12 21:55:59 -08:00
Parker Moore
45f10a22da Update number of Jekyll-powered blogs on Sites page 2013-01-12 15:36:11 -08:00
Parker Moore
078972de4b Remove Octopress site from list of Jekyll-powered Sites 2013-01-12 15:35:21 -08:00
Parker Moore
4bb5158b09 New sub-titles for sub-command options table 2013-01-12 15:34:05 -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
11ca1dfa78 Updated history to reflect merging of #580. 2013-01-12 15:15:32 -08:00
7rans
e8c74fe7a8 Layouts default to page or post depending upon type. 2013-01-12 13:49:45 -08:00
Parker Moore
d9bc6b57d5 Updated gemspec to include new command and fixture files in manifest 2013-01-12 13:19:29 -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
3d093f0035 Using new command structure in Rakefile 2013-01-11 23:59:21 -08:00
Parker Moore
42fa1046db Using internal links for homepage 2013-01-11 23:51:32 -08:00
Parker Moore
5db1bba6fd auto => watch 2013-01-11 23:51:22 -08:00
Parker Moore
64cbaa1d85 Configuration docs updated with new structure 2013-01-11 23:51:06 -08:00
Parker Moore
39b159c258 Return of the "sites" page - for learning purposes 2013-01-11 23:50:36 -08:00
Parker Moore
9fc89482b3 Using build and serve sub-commands in docs 2013-01-11 23:50:13 -08:00
Parker Moore
14cabab254 Merge pull request #690 from tombell/jekyll-command-redux
The Big Jekyll Command Cleanup
2013-01-11 21:47:59 -08:00
Tom Bell
7f072ed578 Merge branch 'master' 2013-01-12 01:18:41 +00:00
Parker Moore
9414281521 Merge pull request #750 from mojombo/update-travis-config
Updating travis configuration to explicitly run 'rake' behind bundle exec
2013-01-11 16:52:00 -08:00
Parker Moore
8b9baeee0e Revert "Specific patch version of 1.9.3: 362."
This reverts commit e4517c42af.
2013-01-11 16:45:17 -08:00
Parker Moore
e4517c42af Specific patch version of 1.9.3: 362. 2013-01-11 16:26:06 -08:00
Parker Moore
a8d07dd5f5 Updating travis configuration to explicitly run 'rake' behind bundle exec. 2013-01-11 16:21:31 -08:00
Parker Moore
36ba434115 Updated history to reflected merged PRs, #745 and #685. 2013-01-11 16:17:03 -08:00
Parker Moore
4336b6dd4e Added Travis CI badge to README 2013-01-11 15:55:14 -08:00
Parker Moore
d2e750cc74 removed extraneous whitespace in test_site.rb 2013-01-11 15:54:57 -08:00
Parker Moore
418ef419dd Merge pull request #685 from edeustace/keep_files_feature
Keep files feature
2013-01-11 15:47:26 -08:00
edeustace
0fa55418e9 merge lastest from mojombo/jekyll master 2013-01-11 12:23:53 +01:00
Jashank Jeremy
68333cd221 Slight stylistic tweak to LSI initialisation.
Recommended-by: parkr
2013-01-11 20:02:31 +11: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