zydronium/neocities
1
0
Fork 0
mirror of https://github.com/neocities/neocities.git synced 2025-06-26 06:04:35 +02:00
Code Issues Projects Releases Packages Wiki Activity

Merge changes from remote

Browse source
This commit is contained in:
Kyle Drake 2014-12-22 16:01:41 -08:00
commit 64f625cf41
4 changed files with 7 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

2
Gemfile.lock
View file

@ -102,7 +102,7 @@ GEM
nokogiri (1.6.3.1) nokogiri (1.6.3.1)
mini_portile (= 0.6.0) mini_portile (= 0.6.0)
pg (0.17.1) pg (0.17.1)
phantomjs (1.9.7.0) phantomjs (1.9.7.1)
poltergeist (1.5.1) poltergeist (1.5.1)
capybara (~> 2.1) capybara (~> 2.1)
cliver (~> 0.3.1) cliver (~> 0.3.1)

2
models/site.rb
View file

@ -559,7 +559,7 @@ class Site < Sequel::Model
uploaded_size = uploaded.size uploaded_size = uploaded.size
FileUtils.mv uploaded.path, path FileUtils.cp uploaded.path, path
File.chmod 0640, path File.chmod 0640, path
site_file ||= SiteFile.new site_id: self.id, path: relative_path site_file ||= SiteFile.new site_id: self.id, path: relative_path

2
views/site_files/text_editor.erb
View file

@ -113,7 +113,7 @@
if(unsavedChanges == false) if(unsavedChanges == false)
return return
$.ajax({ $.ajax({
url: '/site_files/save/<%= @filename %>?csrf_token=<%= csrf_token %>', url: '/site_files/save/<%= Rack::Utils.escape @filename %>?csrf_token=<%= Rack::Utils.escape csrf_token %>',
data: editor.getValue(), data: editor.getValue(),
processData: false, processData: false,
contentType: false, contentType: false,

3
workers/screenshot_worker.rb
View file

@ -50,7 +50,8 @@ class ScreenshotWorker
# :nocov: # :nocov:
puts "#{username}/#{path} is timing out, discontinuing" puts "#{username}/#{path} is timing out, discontinuing"
site = Site[username: username] site = Site[username: username]
site.update is_crashing: true site.is_crashing = true
site.save_changes validate: false
# Don't enable until we know it works well. # Don't enable until we know it works well.
=begin =begin