Revert "Merge branch 'ruby-2.1'"

This reverts commit 18dd5acca7, reversing
changes made to 55fef2f7c6.

.rbenv-version

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

Gemfile

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

app/models/upload.rb

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

config/application.rb

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