From 2b8497531df0c005af1d5dc849f5f933093b2117 Mon Sep 17 00:00:00 2001
From: Daniele Grandini <daniele AT grandini.com>
Date: Fri, 24 Feb 2017 13:41:52 +0100
Subject: [PATCH] rebasing

---
 bin/gollum        | 7 -------
 lib/gollum/app.rb | 1 +
 2 files changed, 1 insertion(+), 7 deletions(-)

diff --git a/bin/gollum b/bin/gollum
index 2600579c..d8b130bb 100755
--- a/bin/gollum
+++ b/bin/gollum
@@ -245,13 +245,6 @@ else
     require cfg
   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]
 
   if base_path.nil?
diff --git a/lib/gollum/app.rb b/lib/gollum/app.rb
index 40510727..00ba6a74 100644
--- a/lib/gollum/app.rb
+++ b/lib/gollum/app.rb
@@ -97,6 +97,7 @@ module Precious
     before do
       settings.wiki_options[:allow_editing] = settings.wiki_options.fetch(:allow_editing, true)
       @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]
       @base_url = url('/', false).chomp('/')
       @page_dir = settings.wiki_options[:page_file_dir].to_s