wiki.ohea.xyz/gollum
10
0
Fork 0
Code Issues Pull Requests 1 Packages Projects Releases Wiki Activity

rebasing

Browse Source
This commit is contained in:
Daniele Grandini
2017-02-24 13:41:52 +01:00
parent fdbde7840d
commit 2b8497531d
2 changed files with 1 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files
bin/gollum
-7
View File
@@ -245,13 +245,6 @@ else
require cfg require cfg
end end
if wiki_options[:plantuml_url]
Gollum::Filter::PlantUML.configure do |config|
puts "Using #{wiki_options[:plantuml_url]} as PlantUML endpoint"
config.url = wiki_options[:plantuml_url]
end
end
base_path = wiki_options[:base_path] base_path = wiki_options[:base_path]
if base_path.nil? if base_path.nil?
lib/gollum/app.rb
+1
View File
@@ -97,6 +97,7 @@ module Precious
before do before do
settings.wiki_options[:allow_editing] = settings.wiki_options.fetch(:allow_editing, true) settings.wiki_options[:allow_editing] = settings.wiki_options.fetch(:allow_editing, true)
@allow_editing = settings.wiki_options[:allow_editing] @allow_editing = settings.wiki_options[:allow_editing]
forbid unless @allow_editing || request.request_method == "GET"
Precious::App.set(:mustache, {:templates => settings.wiki_options[:template_dir]}) if settings.wiki_options[:template_dir] Precious::App.set(:mustache, {:templates => settings.wiki_options[:template_dir]}) if settings.wiki_options[:template_dir]
@base_url = url('/', false).chomp('/') @base_url = url('/', false).chomp('/')
@page_dir = settings.wiki_options[:page_file_dir].to_s @page_dir = settings.wiki_options[:page_file_dir].to_s