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

config/deploy.rb

@@ -70,7 +70,7 @@ end
 
 desc "Change ownership of common directory to user"
 task :reset_ownership_of_common_directory do
-  sudo "chown -R #{user}:#{user} /var/www/danbooru2"
+  sudo "chown -R #{user}:#{user} #{deploy_to}"
 end
 
 namespace :deploy do

config/routes.rb

@@ -64,7 +64,11 @@ Danbooru::Application.routes.draw do
       get :banned
     end
   end
-  resources :artist_versions, :only => [:index]
+  resources :artist_versions, :only => [:index] do
+    collection do
+      get :search
+    end
+  end
   resources :bans
   resources :comments do
     resources :votes, :controller => "comment_votes", :only => [:create, :destroy]
@@ -139,6 +143,7 @@ Danbooru::Application.routes.draw do
     resources :votes, :controller => "post_votes", :only => [:create, :destroy]
     member do
       put :revert
+      put :copy_notes
       get :show_seq
     end
   end