From 9b89e3167934889b7ef1cccbfe00b7fda3ca924f Mon Sep 17 00:00:00 2001
From: flowerysong <junk+github@flowerysong.com>
Date: Wed, 4 Mar 2020 05:41:19 -0500
Subject: [PATCH] 5.x: Fix a couple of upload issues (#1469)

* Remove debugging junk

* Remove duplicate `#{dir}` from upload commit message
---
 lib/gollum/app.rb                                 | 2 +-
 lib/gollum/public/gollum/javascript/gollum.js.erb | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/lib/gollum/app.rb b/lib/gollum/app.rb
index 349481df..b283df48 100644
--- a/lib/gollum/app.rb
+++ b/lib/gollum/app.rb
@@ -224,7 +224,7 @@ module Precious
         contents = ::File.read(tempfile)
         reponame = "#{dir}/#{filename}.#{format}"
 
-        options = { :message => "Uploaded file to #{dir}/#{reponame}" }
+        options = { :message => "Uploaded file to #{reponame}" }
         options[:parent] = wiki.repo.head.commit if wiki.repo.head
 
         author  = session['gollum.author']
diff --git a/lib/gollum/public/gollum/javascript/gollum.js.erb b/lib/gollum/public/gollum/javascript/gollum.js.erb
index da7673e2..465ed141 100755
--- a/lib/gollum/public/gollum/javascript/gollum.js.erb
+++ b/lib/gollum/public/gollum/javascript/gollum.js.erb
@@ -185,7 +185,7 @@ $(document).ready(function() {
             success: function(data) {
               // File successfully uploaded
               $('#wiki-content').removeClass('uploading');
-              flashNotice("success", "Your file was successfully uploaded.", "foobar", "alert('flash!')");
+              flashNotice("success", "Your file was successfully uploaded.");
             },
             error: function(data, textStatus, errorThrown) {
               $('#wiki-content').removeClass('uploading');