Merge branch 'forge' of https://bdgit.educoder.net/Hjqreturn/educoder into forge

# Conflicts:
#	app/controllers/application_controller.rb

app/controllers/application_controller.rb

@@ -328,7 +328,7 @@ class ApplicationController < ActionController::Base
 
 	def current_user
 		# User.current
-		User.find_by_id 50207
+		User.find_by_id 36401
 	end
 
 	## 默认输出json
@@ -627,6 +627,16 @@ class ApplicationController < ActionController::Base
 		error.backtrace.each { |msg| Rails.logger.error(msg) }
 	end
 
+	def find_user
+		@user = User.find_by_login params[:login]
+    render_not_found unless @user
+	end
+
+	def find_repository
+		@repo = @user.repositories.find_by_identifier params[:repo_identifier]
+    render_not_found unless @repo
+	end
+
   private
 	def object_not_found
 		uid_logger("Missing template or cant't find record, responding with 404")

app/controllers/projects_controller.rb

@@ -30,7 +30,7 @@ class ProjectsController < ApplicationController
   end
 
   def branches
-    @branches = Gitea::Repository::BranchesService.new(current_user, @project.identifier).call
+    @branches = Gitea::Repository::BranchesService.new(@project.owner, @project.identifier).call
   end
 
   def group_type_list

app/controllers/repositories_controller.rb

@@ -24,17 +24,6 @@ class RepositoriesController < ApplicationController
   end
 
   private
-
-  def find_repository
-    @repo = @user.repositories.find_by_identifier params[:repo_identifier]
-    render_not_found unless @repo
-  end
-
-  def find_user
-    @user = User.find_by_login params[:login]
-    render_not_found unless @user
-  end
-
   def authorizate!
     if @repo.hidden? && @repo.user != current_user
       render_forbidden