enable thumbnailing on S3

- added url to optimized image model
- refactored s3_store & local_store
This commit is contained in:
Régis Hanol
2013-07-31 23:26:34 +02:00
parent 36b6b8d78e
commit ed9417fa3b
23 changed files with 522 additions and 478 deletions

View File

@ -81,7 +81,7 @@ module Discourse
def self.git_version
return $git_version if $git_version
f = Rails.root.to_s + "/config/version"
f = Rails.root.to_s + "/lib/version"
require f if File.exists?("#{f}.rb")
begin
@ -98,6 +98,16 @@ module Discourse
user
end
def self.store
if SiteSetting.enable_s3_uploads?
@s3_store_loaded ||= require 'file_store/s3_store'
S3Store.new
else
@local_store_loaded ||= require 'file_store/local_store'
LocalStore.new
end
end
private
def self.maintenance_mode_key