Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP

Comparing changes

Choose two branches to see what's changed or to start a new pull request. If you need to, you can also compare across forks.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also compare across forks.
base fork: ndastur/gollum
base: 8da0057fdf
...
head fork: ndastur/gollum
compare: 117aec1197
Checking mergeability… Don't worry, you can still create the pull request.
  • 4 commits
  • 2 files changed
  • 0 commit comments
  • 3 contributors
Showing with 6 additions and 1 deletion.
  1. +1 −1  lib/gollum/committer.rb
  2. +5 −0 test/test_wiki.rb
View
2  lib/gollum/committer.rb
@@ -118,7 +118,7 @@ def add_to_index(dir, name, format, data, allow_same_ext = false)
def update_working_dir(dir, name, format)
unless @wiki.repo.bare
if @wiki.page_file_dir
- dir = dir.size.zero? ? @wiki.page_file_dir : File.join(dir, @wiki.page_file_dir)
+ dir = dir.size.zero? ? @wiki.page_file_dir : ::File.join(dir, @wiki.page_file_dir)
end
path =
View
5 test/test_wiki.rb
@@ -282,6 +282,11 @@
assert_equal "Hi", File.read(File.join(@path, @page_file_dir, "New-Page.md"))
assert !File.exist?(File.join(@path, "New-Page.md"))
end
+
+ test "edit a page in a sub directory" do
+ page = @wiki.page('foo')
+ @wiki.update_page(page, page.name, page.format, 'new contents', commit_details)
+ end
test "a file in page file dir should be found" do
assert @wiki.page("foo")

No commit comments for this range

Something went wrong with that request. Please try again.