Merge branch 'master' of https://github.com/r888888888/danbooru

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

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

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 {
       }
     }
   }
-}
+}

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.