From 51f41d0e8d2b9a9491c0cf37e6157788d071f304 Mon Sep 17 00:00:00 2001
From: r888888888 <r888888888@gmail.com>
Date: Tue, 30 Jul 2013 15:15:32 -0700
Subject: [PATCH 1/3] update version

---
 config/danbooru_default_config.rb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/config/danbooru_default_config.rb b/config/danbooru_default_config.rb
index 794596b9b..88b1c9773 100644
--- a/config/danbooru_default_config.rb
+++ b/config/danbooru_default_config.rb
@@ -4,7 +4,7 @@ module Danbooru
   class Configuration
     # The version of this Danbooru.
     def version
-      "2.26.0"
+      "2.27.0"
     end
 
     # The name of this Danbooru.

From cd45a093f30445669eb6dc022eaff641bf4af9e7 Mon Sep 17 00:00:00 2001
From: Kevin Xiwei Zheng <blankplacement@gmail.com>
Date: Wed, 31 Jul 2013 10:29:27 -0400
Subject: [PATCH 2/3] Style "Upload for approval" label as inline element

Fixes #1907.
---
 app/assets/stylesheets/specific/uploads.css.scss | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/app/assets/stylesheets/specific/uploads.css.scss b/app/assets/stylesheets/specific/uploads.css.scss
index c5142af42..dab24f549 100644
--- a/app/assets/stylesheets/specific/uploads.css.scss
+++ b/app/assets/stylesheets/specific/uploads.css.scss
@@ -4,6 +4,10 @@ div#c-uploads {
       margin-bottom: 2em;
     }
 
+    label[for="upload_as_pending"] {
+      display: inline;
+    }
+
     fieldset.ratings {
       label {
         display: inline;
@@ -31,4 +35,4 @@ div#c-uploads {
       }
     }
   }
-}
\ No newline at end of file
+}

From 51e656d61e25f31401492b874b0a5115c6c1f943 Mon Sep 17 00:00:00 2001
From: r888888888 <r888888888@gmail.com>
Date: Wed, 31 Jul 2013 15:47:08 -0700
Subject: [PATCH 3/3] fixes #1905

---
 Gemfile      | 2 +-
 Gemfile.lock | 9 +++++++--
 2 files changed, 8 insertions(+), 3 deletions(-)

diff --git a/Gemfile b/Gemfile
index 9f5ad198f..f0ead81d6 100644
--- a/Gemfile
+++ b/Gemfile
@@ -39,7 +39,7 @@ gem 'bcrypt-ruby', :require => "bcrypt"
 gem 'aws-s3', :require => "aws/s3"
 gem 'awesome_print'
 gem 'statistics2'
-gem 'ruby-imagespec', :require => "image_spec"
+gem 'ruby-imagespec', :require => "image_spec", :git => "https://github.com/r888888888/ruby-imagespec.git"
 
 group :production do
   gem 'unicorn', :platforms => :ruby
diff --git a/Gemfile.lock b/Gemfile.lock
index fc53d37f1..c43e7201b 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -23,6 +23,12 @@ GIT
   specs:
     ffaker (1.15.0)
 
+GIT
+  remote: https://github.com/r888888888/ruby-imagespec.git
+  revision: 41859ac5808cd64f2385082171ee2cc9f80bfcd1
+  specs:
+    ruby-imagespec (0.3.1)
+
 GEM
   remote: http://gemcutter.org/
   specs:
@@ -153,7 +159,6 @@ GEM
       json (~> 1.4)
     ref (1.0.4)
     rmagick (2.13.2)
-    ruby-imagespec (0.3.1)
     ruby-prof (0.13.0)
     sass (3.2.7)
     sass-rails (3.2.6)
@@ -237,7 +242,7 @@ DEPENDENCIES
   pry
   rails (= 3.2.12)
   rmagick
-  ruby-imagespec
+  ruby-imagespec!
   ruby-prof
   sanitize!
   sass-rails