Merge branch '5.x' into remove_livepreview

2017-04-13 20:00:59 +02:00
parent 5aa5bccda3 0fa47047f3
commit 64fd56e8ef
16 changed files with 65 additions and 52 deletions
@@ -105,6 +105,13 @@ MSG
  opts.on("--no-edit", "Disable the feature of editing pages.")  do
    wiki_options[:allow_editing] = false
  end
+  end
+  opts.on("--follow-renames", "Follow pages across renames in the History view. Default except on jruby.") do
+    wiki_options[:follow_renames] = true
+  end
+  opts.on("--no-follow-renames", "Do not follow pages across renames in the History view.") do
+    wiki_options[:follow_renames] = false
+  end
  opts.on("--allow-uploads [MODE]", [:dir, :page], "Enable file uploads.",
    "If set to 'dir', Gollum will store all uploads in the '<git-repo>/uploads/' directory.",
    "If set to 'page', Gollum will store each upload at the currently edited page.") do |mode|