Commit Graph

2686 Commits

Author SHA1 Message Date
Matt Rogers 045464c8d4 Update history to reflect merge of #1553 2013-09-16 20:38:47 -05:00
Matt Rogers 0b40bd033b Merge pull request #1553 from penibelst/change-link-liquid
Change links to Liquid documentation
2013-09-16 18:38:13 -07:00
Matt Rogers bff0f9e537 Update history to reflect merge of #1556 2013-09-16 20:35:14 -05:00
Matt Rogers de49342324 Merge pull request #1556 from maul-esel/dest-match
Fix up matching against source and destination when the two locations are similar.
2013-09-16 18:34:22 -07:00
Matt Rogers 454e038fad Require 'pathname' 2013-09-16 20:29:57 -05:00
Matt Rogers c376f345fa Update history to reflect merge of #1539 2013-09-16 20:29:17 -05:00
Matt Rogers 52a39db029 Merge pull request #1539 from maul-esel/coveralls
Add support for coveralls.io coverage reports
2013-09-16 18:28:28 -07:00
Anatol Broder 3dadc94ce4 Don’t repeat yourself 2013-09-16 23:16:41 +02:00
maul.esel 0f4d646510 extend feature tests and use scenario outline 2013-09-16 15:19:29 +02:00
maul.esel bec4a07c12 Fix handling of source-dest matching being too aggressive
Fixes #1130.
2013-09-16 14:41:20 +02:00
maul.esel f606d9339b add features to test source and dest matching 2013-09-16 14:30:37 +02:00
Anatol Broder 891ea8f604 People can symlink it if they want in unsafe mode 2013-09-16 08:37:07 +02:00
Anatol Broder 081b974114 Resolve conflict 2013-09-16 08:19:56 +02:00
Anatol Broder 79f50b0568 Resolve conflict 2013-09-16 08:15:10 +02:00
Parker Moore 79c2d5c8f7 Update history to reflect merge of #1555 2013-09-15 20:19:38 -04:00
Parker Moore 1aacda28b0 Merge pull request #1555 from davidensinger/patch-1
Add link to Jekyll Suggested Tweet liquid tag to list of Tags plugins.
2013-09-15 17:19:03 -07:00
David Ensinger ed92d1c4c2 Add link to Jekyll Suggested Tweet liquid tag to list of Tags plugins. 2013-09-15 18:56:18 -04:00
Parker Moore 6d28d5f95f Update history to reflect merge of #1554 2013-09-15 17:26:15 -04:00
Parker Moore ede0d6bd24 Merge pull request #1554 from grobmeier/patch-1
It's dbname, not database
2013-09-15 14:21:46 -07:00
Parker Moore ab4fb89043 Fix params on JekyllImport::WordPress.process so it's using hash 2013-09-15 23:13:02 +02:00
Parker Moore 30bce38ef2 Fix JekyllImport::WordPress instructions on docs site to use hash as parameter.
See comment by @grobmeier on 97cb3f1336
2013-09-15 23:11:22 +02:00
Christian Grobmeier f15f29a34b It's dbname, not database 2013-09-15 13:06:00 +02:00
Anatol Broder d761338c2c Change links to Liquid documentation 2013-09-15 07:44:49 +02:00
Matt Rogers 94eed46436 Release 1.2.1 2013-09-14 22:21:15 -05:00
Matt Rogers a8c03ae3ec Merge pull request #1551 from mojombo/release-1-2-1
Release v1.2.1
2013-09-14 20:20:04 -07:00
Parker Moore 6f053fbc8c Update gemspec & version to v1.2.1 2013-09-14 20:59:06 -04:00
Parker Moore be9c0dcc7e Update docs/history.md for v1.2.1 2013-09-14 20:57:10 -04:00
Parker Moore f169e37c81 Add release post. 2013-09-14 20:56:42 -04:00
Parker Moore f922ae10e5 Update the History file 2013-09-14 20:49:23 -04:00
Parker Moore d445798330 Fix site:releases:new rake task. 2013-09-14 20:48:20 -04:00
Parker Moore a1e16b3d58 Update history to reflect merge of #1518 2013-09-14 20:45:24 -04:00
Parker Moore 3ddc33c4bf Merge pull request #1518 from mojombo/fix-serve-detatch
Print better messages for detached server. Mute output on detach.
2013-09-14 17:44:20 -07:00
Parker Moore 97cb3f1336 Update JekyllImport::WordPress instructions on docs site.
Closes #1548.
2013-09-14 20:16:26 -04:00
Parker Moore 5355fcf02d Update Contributing page in the docs to match the new CONTRIBUTING.markdown. #1537. 2013-09-14 20:09:26 -04:00
maul.esel b26327f20a simplify conditions for coverage reports 2013-09-14 15:28:41 +02:00
Matt Rogers 1473448dfd Update history to reflect merge of #1537 2013-09-14 08:00:35 -05:00
Matt Rogers 46da09694d Merge pull request #1537 from mojombo/better-pr
Update CONTRIBUTING docs for better PRs
2013-09-14 05:59:50 -07:00
maul.esel ed58ba1508 add tests for moving of coderay settings for kramdown 2013-09-13 14:06:16 +02:00
maul.esel 76d56c2352 shorten test code by moving converter instantiation to #setup 2013-09-13 14:06:16 +02:00
maul.esel 29d0841e97 #to_sym is called by #symbolize_keys 2013-09-13 14:06:16 +02:00
maul.esel aa10f8c89e add status badge to README 2013-09-12 21:19:36 +02:00
maul.esel 66606a7e82 enable coveralls on Travis-CI 2013-09-12 21:19:36 +02:00
maul.esel a12227c07a setup coveralls for unit tests 2013-09-12 21:19:36 +02:00
maul.esel 5ee41cd3bb setup coveralls for cucumber 2013-09-12 21:19:36 +02:00
maul.esel 699627e708 add coveralls to gemfile 2013-09-12 21:19:30 +02:00
maul.esel f20b7d8bd2 use assert_match 2013-09-12 20:19:56 +02:00
Parker Moore 4b8bb68e56 Cleanup newlines in Commands::Serve 2013-09-12 14:05:16 -04:00
Parker Moore c926596be7 Print better messages for detached server. Mute output on detach. 2013-09-12 14:02:52 -04:00
Parker Moore 214c851be5 Update history to reflect merge of #1536 2013-09-12 14:02:22 -04:00
Parker Moore 34a888e7b0 Merge pull request #1536 from mojombo/liquid-2.5.2
Upgrade to Liquid >= 2.5.2, < 2.6
2013-09-12 11:01:55 -07:00