From 616aef439496044861840fff546bb2306ce19c46 Mon Sep 17 00:00:00 2001
From: r888888888 <r888888888@gmail.com>
Date: Thu, 24 Apr 2014 16:12:30 -0700
Subject: [PATCH] Revert "Merge branch 'ruby-2.1'"

This reverts commit 18dd5acca7873288ea79360ffaa4902ca18963a7, reversing
changes made to 55fef2f7c68c9d1cf28701754ccdd4e6b7fc3aec.
---
 .rbenv-version        | 2 +-
 Gemfile               | 3 ---
 app/models/upload.rb  | 4 ++--
 config/application.rb | 2 --
 4 files changed, 3 insertions(+), 8 deletions(-)

diff --git a/.rbenv-version b/.rbenv-version
index 7c3272873..546d4d8a9 100644
--- a/.rbenv-version
+++ b/.rbenv-version
@@ -1 +1 @@
-2.1.1
\ No newline at end of file
+1.9.3-p327
\ No newline at end of file
diff --git a/Gemfile b/Gemfile
index 374f77c17..5e8b33318 100644
--- a/Gemfile
+++ b/Gemfile
@@ -53,6 +53,3 @@ group :development do
   gem 'ruby-prof'
 end
 
-group :development, :test do
-  gem 'pry'
-end
diff --git a/app/models/upload.rb b/app/models/upload.rb
index 2ae95fb4b..ff5208e50 100644
--- a/app/models/upload.rb
+++ b/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/
diff --git a/config/application.rb b/config/application.rb
index b78818874..18dbab17f 100644
--- a/config/application.rb
+++ b/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