jaculabilis/danbooru
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Merge branch 'ruby-2.1'

Browse Source 
Conflicts:
	app/assets/javascripts/comments.js
	app/helpers/delayed_jobs_helper.rb
This commit is contained in:
r888888888
2014-04-23 18:05:31 -07:00
parent 55fef2f7c6 20b595d9f3
commit 18dd5acca7
4 changed files with 8 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
.rbenv-version
View File

@@ -1 +1 @@
1.9.3-p327 2.1.1

3
Gemfile
View File

@@ -53,3 +53,6 @@ group :development do
gem 'ruby-prof' gem 'ruby-prof'
end end
group :development, :test do
gem 'pry'
end

4
app/models/upload.rb
View File

@@ -201,13 +201,13 @@ class Upload < ActiveRecord::Base
def file_header_to_content_type(source_path) def file_header_to_content_type(source_path)
case File.read(source_path, 10) case File.read(source_path, 10)
when /^\xff\xd8/ when /^\xff\xd8/n
"image/jpeg" "image/jpeg"
when /^GIF87a/, /^GIF89a/ when /^GIF87a/, /^GIF89a/
"image/gif" "image/gif"
when /^\x89PNG\r\n\x1a\n/ when /^\x89PNG\r\n\x1a\n/n
"image/png" "image/png"
when /^CWS/, /^FWS/, /^ZWS/ when /^CWS/, /^FWS/, /^ZWS/

2
config/application.rb
View File

@@ -21,4 +21,6 @@ module Danbooru
config.action_mailer.perform_deliveries = true config.action_mailer.perform_deliveries = true
config.log_tags = [lambda {|req| "PID:#{Process.pid}"}] config.log_tags = [lambda {|req| "PID:#{Process.pid}"}]
end end
I18n.enforce_available_locales = false
end end