Sunny Ripert b5653464d2 Merge branch 'master' into base-url ...

Conflicts:
	lib/gollum/frontend/public/gollum/css/_styles.css
	lib/gollum/frontend/public/gollum/javascript/gollum.js
	lib/gollum/frontend/public/gollum/livepreview/js/livepreview.js
	lib/gollum/frontend/templates/file_view.mustache
	lib/gollum/frontend/templates/layout.mustache
	lib/gollum/frontend/templates/page.mustache

2012-07-25 10:00:52 +02:00

..

examples

Add a new file and sub-directory - 'Rivendell/Elrond.md' so we can test Sidebar/Header/Footer inheritance from parent directory.

2012-07-09 11:50:08 +01:00

file_view

Fix tests.

2012-07-17 12:00:42 +02:00

helper.rb

Hush test clone warnings

2011-09-27 13:49:59 -05:00

test_app_helpers.rb

Make the Sinatra app directory aware.

2012-06-21 15:59:01 +01:00

test_app.rb

Call to_url on rename to prevent invalid renames.

2012-07-22 13:45:30 -06:00

test_committer.rb

Add a new file and sub-directory - 'Rivendell/Elrond.md' so we can test Sidebar/Header/Footer inheritance from parent directory.

2012-07-09 11:50:08 +01:00

test_file_view.rb

File view links use '-' instead of %20.

2012-07-04 11:04:51 -06:00

test_file.rb

nuke whitespace

2012-04-10 18:38:04 -07:00

test_git_access.rb

Add a new file and sub-directory - 'Rivendell/Elrond.md' so we can test Sidebar/Header/Footer inheritance from parent directory.

2012-07-09 11:50:08 +01:00

test_markup.rb

Fix parsing extra whitespace in code blocks

2012-07-21 15:34:56 +02:00

test_page_revert.rb

Comment out test. See #363.

2012-07-18 10:35:53 -06:00

test_page.rb

Make pages inherit their sidebar/header/footer from parent directories regardless of the current 'page_file_dir' of the wiki. refs #413 (https://github.com/github/gollum/issues/413)

2012-07-09 12:10:41 +01:00

test_pages_view.rb

Fixed tests to make up for base url

2012-06-28 17:31:19 +02:00

test_unicode.rb

Don't mess with the commit message.

2012-07-21 16:52:18 -06:00

test_wiki.rb

Add a new file and sub-directory - 'Rivendell/Elrond.md' so we can test Sidebar/Header/Footer inheritance from parent directory.

2012-07-09 11:50:08 +01:00