Merge branch 'dev_trustie' into dev_chain

app/controllers/application_controller.rb

@@ -386,7 +386,6 @@ class ApplicationController < ActionController::Base
 		else
 			User.current
 		end
-		# User.current
 	end
 
 	## 默认输出json

app/controllers/repositories_controller.rb

@@ -97,7 +97,7 @@ class RepositoriesController < ApplicationController
   end
 
   def sync_mirror
-    return render_error("正在镜像中..") if  @repo.mirror.warning?
+    return render_error("正在镜像中..") if  @repo.mirror.waiting?
 
     @repo.sync_mirror!
     SyncMirroredRepositoryJob.perform_later(@repo.id, current_user.id)