Commit Graph

199 Commits

Author SHA1 Message Date
Randy Merrill 7427ddd900 Adding some tests to test that the commiter can retrieve parents that are not the same as the wiki ref.
Also testing that the default wiki ref works without passing a ref.
2011-01-27 13:00:54 -08:00
rick 8ddb781588 yield the created SHA1 in the after_commit callback 2011-01-19 05:51:16 -08:00
rick 2b1510af11 edit a page, sidebar, and footer all in one commit 2011-01-19 05:20:58 -08:00
rick aae9eb1883 refactor wiki commit logic into Gollum::Committer class 2011-01-19 05:16:16 -08:00
rick a9d4e117aa fix markup formatting edge case 2011-01-17 10:17:14 -08:00
rick feff07ae9c Merge branch 'org-mode-file-links' of https://github.com/hugoduncan/gollum into hugoduncan-org-mode-file-links 2011-01-17 10:12:50 -08:00
rick e77cba96fd add git test fixture for page_file_dir tests 2011-01-17 10:08:58 -08:00
rick f6f8428daf merge page-file-dir_option branch 2011-01-17 10:05:21 -08:00
rick ca2aaa543a Merge branch 'mediawiki_fixups' of https://github.com/qmx/gollum into qmx-mediawiki_fixups 2011-01-17 09:06:00 -08:00
rick e2a4514be5 add the ability to revert whole commits that touch multiple files 2011-01-13 15:50:35 -08:00
rick 002fe8d409 add method for getting the reverse diff without a page path 2011-01-13 13:32:15 -08:00
rick 9a4e2e39a8 update albino to 1.2.3, handle bad code blocks gracefully 2011-01-12 15:00:58 -08:00
Douglas Campos 2dbb4e9fa7 fixed mediawiki link handling 2011-01-12 00:57:21 -02:00
Douglas Campos e4103e6181 testing link labeling current behavior 2011-01-11 22:50:59 -02:00
rick c5e4935e85 tweak code markup parser so that blocks without a language are just output in pre tags 2011-01-11 01:00:51 -08:00
rick 45765eb161 add proper shell escaping for Albino 2011-01-11 00:58:04 -08:00
Hugo Duncan 32d1f9eb2f Add parsing of org-mode [[file:path.org][label]] links 2011-01-07 23:59:36 -05:00
rick 4fa3951718 fix tests for normalize_dir 2010-12-31 12:30:23 -06:00
rick e641f69589 add test for BlobEntry.normalize_dir 2010-12-31 12:25:18 -06:00
rick 491eee7ebd each test file that clones a repo gets its own repo path 2010-12-21 10:37:04 -08:00
Eston Bond 58a680ab6d Merge branch 'master' of git://github.com/github/gollum 2010-12-21 02:36:43 -08:00
rick 8769e3475b it does not assume you want to revert the parent of the first sha when reverting 2 shas 2010-12-09 17:21:09 -08:00
rick 979d89a23f add revert action 2010-12-09 17:19:18 -08:00
rick 1875eef8f6 update frontend tests to use sample 'revert' repo 2010-12-09 17:00:52 -08:00
rick 79a1fb860d add ability to change footer and sidebar of page 2010-12-09 16:49:03 -08:00
rick 511b62c5ab add page rename test 2010-12-09 16:29:18 -08:00
rick 0b37597834 helps if the test has some kind of assertion 2010-12-09 16:22:37 -08:00
rick ff1c8868dc add duplicate page test 2010-12-09 16:20:34 -08:00
rick f5480c21d2 fix previews 2010-12-09 16:15:28 -08:00
rick 2c8be3d95b add tests for creating/updating wikis, fix page name bug along the way 2010-12-09 16:11:12 -08:00
rick aeb90c6293 use expand_path so ruby doesnt load helper.rb twice 2010-12-09 13:58:51 -08:00
rick f222bbcbac extract page revert tests to a separate file 2010-12-09 13:31:22 -08:00
rick e2fbac96cb sometimes reverts fail, yo 2010-12-08 15:55:35 -08:00
rick d436f5f112 cleanliness is next to godliness 2010-12-08 15:40:57 -08:00
rick 074b2119fa use a temp GIT_INDEX_FILE when working with the real git index (during reverts) 2010-12-08 15:17:18 -08:00
rick 057baac3ce rm cloned git paths 2010-12-08 15:03:21 -08:00
rick 25a56725f9 add ability to revert wiki pages 2010-12-08 14:57:29 -08:00
rick 5bb7417495 unnecessary test files 2010-12-08 08:48:38 -08:00
rick a657b12a88 revert last commit due to parsing issues 2010-12-07 15:29:25 -08:00
rick 5e0919efe1 remove unused method that breaks due to dependence on unreleased grit. whew 2010-12-07 13:26:18 -08:00
rick 6bada4cef5 useless 2010-12-06 17:43:22 -08:00
rick d32ab724d3 Don't modify content inside <pre> tags during rendering. 2010-12-02 19:28:31 -08:00
rick 2cbe3957cf add Page _Sidebars 2010-12-02 18:16:37 -08:00
rick 2fe6b7b7f1 provide access to the parsed Nokogiri document fragment when rendering marked up content. 2010-12-02 14:47:20 -08:00
rick 0b8bc597a7 merge latest tweaks to master 2010-11-09 12:39:28 -08:00
rick 39d16b8c43 Merge branch 'text_data_method' of https://github.com/hiroshi/gollum into hiroshi-text_data_method 2010-11-09 12:19:29 -08:00
rick 54917bbdb9 recover from bad shas 2010-10-13 09:52:04 -07:00
rick 94c3ac767e Merge branch 'master' into exp 2010-10-12 10:22:56 -07:00
Marko Anastasov 16ef859073 Ignore case when matching image paths.
Otherwise images with file extensions in caps don't get rendered.
2010-10-12 12:07:07 +02:00
rick 6552323797 implement GitAccess#commits using grit head 2010-10-11 16:58:46 -07:00