mirror of
https://github.com/neocities/neocities.git
synced 2026-05-26 15:48:55 +00:00
Update rmagick (and add io/extra for geoip)
This commit is contained in:
@@ -27,6 +27,7 @@ gem 'scrypt'
|
||||
gem 'rack-cache'
|
||||
gem 'rest-client'
|
||||
gem 'geoip'
|
||||
gem 'io-extra', require: 'io/extra'
|
||||
|
||||
platform :mri, :rbx do
|
||||
gem 'magic' # sudo apt-get install file, For OSX: brew install libmagic
|
||||
|
||||
+3
-1
@@ -79,6 +79,7 @@ GEM
|
||||
http-cookie (1.0.2)
|
||||
domain_name (~> 0.5)
|
||||
i18n (0.6.9)
|
||||
io-extra (1.2.8)
|
||||
jimson-temp (0.9.5)
|
||||
blankslate (>= 3.1.2)
|
||||
multi_json (~> 1.0)
|
||||
@@ -158,7 +159,7 @@ GEM
|
||||
mime-types (>= 1.16, < 3.0)
|
||||
netrc (~> 0.7)
|
||||
retriable (1.4.1)
|
||||
rmagick (2.13.3)
|
||||
rmagick (2.15.0)
|
||||
safe_yaml (1.0.4)
|
||||
sass (3.3.8)
|
||||
screencap (0.1.1)
|
||||
@@ -246,6 +247,7 @@ DEPENDENCIES
|
||||
geoip
|
||||
google-api-client
|
||||
hiredis
|
||||
io-extra
|
||||
jdbc-postgres
|
||||
jruby-openssl
|
||||
json
|
||||
|
||||
@@ -1,4 +1,4 @@
|
||||
require 'RMagick'
|
||||
require 'rmagick'
|
||||
require 'timeout'
|
||||
require 'securerandom'
|
||||
require 'thread'
|
||||
@@ -52,7 +52,7 @@ class ScreenshotWorker
|
||||
site = Site[username: username]
|
||||
site.is_crashing = true
|
||||
site.save_changes validate: false
|
||||
|
||||
|
||||
# Don't enable until we know it works well.
|
||||
=begin
|
||||
if site.email
|
||||
|
||||
@@ -1,4 +1,4 @@
|
||||
require 'RMagick'
|
||||
require 'rmagick'
|
||||
|
||||
class ThumbnailWorker
|
||||
THUMBNAILS_PATH = Site::THUMBNAILS_ROOT
|
||||
@@ -25,4 +25,4 @@ class ThumbnailWorker
|
||||
}
|
||||
end
|
||||
end
|
||||
end
|
||||
end
|
||||
|
||||
Reference in New Issue
Block a user