Merge branch 'devel-1.6.0' of github.com:danmunn/redmine_dmsf into devel-1.6.0

app/controllers/dmsf_folder_permissions_controller.rb

@@ -37,7 +37,7 @@ class DmsfFolderPermissionsController < ApplicationController
 
   def append
     @principals = Principal.where(:id => params[:user_ids]).to_a
-    render :nothing => true if @principals.blank?
+    head 200 if @principals.blank?
   end
 
   def autocomplete_for_user

app/controllers/dmsf_upload_controller.rb

@@ -78,7 +78,7 @@ class DmsfUploadController < ApplicationController
   # REST API and Redmine attachment form
   def upload
     unless request.content_type == 'application/octet-stream'
-      render :nothing => true, :status => 406
+      head 406
       return
     end