Merge branch 'master' into close-accounts

config/danbooru_default_config.rb

@@ -4,7 +4,7 @@ module Danbooru
   class Configuration
     # The version of this Danbooru.
     def version
-      "2.8.0"
+      "2.11.0"
     end
 
     # The name of this Danbooru.

config/deploy.rb

@@ -1,5 +1,6 @@
 set :stages, %w(production staging)
 set :default_stage, "staging"
+set :unicorn_env, "staging"
 require 'capistrano/ext/multistage'
 
 require 'bundler/capistrano'

config/routes.rb

@@ -121,6 +121,7 @@ Danbooru::Application.routes.draw do
     end
   end
   resources :note_versions, :only => [:index]
+  resource :note_previews, :only => [:show]
   resources :pools do
     member do
       put :revert
@@ -239,7 +240,13 @@ Danbooru::Application.routes.draw do
   match "/comment/index" => redirect {|params, req| "/comments?page=#{req.params[:page]}"}
   match "/comment/show/:id" => redirect("/comments/%{id}")
   match "/comment/new" => redirect("/comments")
-  match "/comment/search" => redirect("/comments/search")
+  match("/comment/search" => redirect do |params, req|
+    if req.params[:query] =~ /^user:(.+)/i
+      "/comments?group_by=comment&search[creator_name]=#{CGI::escape($1)}"
+    else
+      "/comments/search"
+    end
+  end)
 
   match "/favorite" => redirect {|params, req| "/favorites?page=#{req.params[:page]}"}
   match "/favorite/index" => redirect {|params, req| "/favorites?page=#{req.params[:page]}"}
@@ -283,7 +290,10 @@ Danbooru::Application.routes.draw do
   match "/post/view/:id" => redirect("/posts/%{id}")
   match "/post/flag/:id" => redirect("/posts/%{id}")
 
-  match "/post_tag_history" => redirect {|params, req| "/post_versions?page=#{req.params[:page]}"}
+  match("/post_tag_history" => redirect do |params, req|
+    page = req.params[:before_id].present? ? "b#{req.params[:before_id]}" : req.params[:page]
+    "/post_versions?page=#{page}&search[updater_id]=#{req.params[:user_id]}"
+  end)
   match "/post_tag_history/index" => redirect {|params, req| "/post_versions?page=#{req.params[:page]}"}
 
   match "/tag/index.xml", :controller => "legacy", :action => "tags", :format => "xml"