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

5.x: Fix a couple of upload issues (#1469)

Browse Source 
* Remove debugging junk

* Remove duplicate `#{dir}` from upload commit message
This commit is contained in:
flowerysong
2020-03-04 05:41:19 -05:00
committed by GitHub
parent 2b380ee6bc
commit 9b89e31679
2 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
lib/gollum/app.rb
+1 -1
View File
@@ -224,7 +224,7 @@ module Precious
contents = ::File.read(tempfile) contents = ::File.read(tempfile)
reponame = "#{dir}/#{filename}.#{format}" 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 options[:parent] = wiki.repo.head.commit if wiki.repo.head
author = session['gollum.author'] author = session['gollum.author']
lib/gollum/public/gollum/javascript/gollum.js.erb
+1 -1
View File
@@ -185,7 +185,7 @@ $(document).ready(function() {
success: function(data) { success: function(data) {
// File successfully uploaded // File successfully uploaded
$('#wiki-content').removeClass('uploading'); $('#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) { error: function(data, textStatus, errorThrown) {
$('#wiki-content').removeClass('uploading'); $('#wiki-content').removeClass('uploading');