|
|
@ -300,8 +300,6 @@ class ProjectsController < ApplicationController
|
|
|
|
return
|
|
|
|
return
|
|
|
|
end
|
|
|
|
end
|
|
|
|
|
|
|
|
|
|
|
|
logger.debug "111111111"*100
|
|
|
|
|
|
|
|
# over
|
|
|
|
|
|
|
|
@author = params[:user_id].blank? ? nil : User.active.find(params[:user_id])
|
|
|
|
@author = params[:user_id].blank? ? nil : User.active.find(params[:user_id])
|
|
|
|
@page = params[:page] ? params[:page].to_i + 1 : 0
|
|
|
|
@page = params[:page] ? params[:page].to_i + 1 : 0
|
|
|
|
# 根据私密性,取出符合条件的所有数据
|
|
|
|
# 根据私密性,取出符合条件的所有数据
|
|
|
@ -321,7 +319,7 @@ class ProjectsController < ApplicationController
|
|
|
|
else
|
|
|
|
else
|
|
|
|
@events_pages = ForgeActivity.includes(:project).where("forge_activities.project_id = ? and projects.is_public = ? and forge_act_type != ? ",@project,1, "Document").order("created_at desc").page(params['page'|| 1]).per(10);
|
|
|
|
@events_pages = ForgeActivity.includes(:project).where("forge_activities.project_id = ? and projects.is_public = ? and forge_act_type != ? ",@project,1, "Document").order("created_at desc").page(params['page'|| 1]).per(10);
|
|
|
|
end
|
|
|
|
end
|
|
|
|
logger.debug "2"*100
|
|
|
|
|
|
|
|
# g = Gitlab.client
|
|
|
|
# g = Gitlab.client
|
|
|
|
unless @project.gpid.nil? || @project.project_score.changeset_num == 0
|
|
|
|
unless @project.gpid.nil? || @project.project_score.changeset_num == 0
|
|
|
|
# rep_statics_commit = @project.rep_statics.order("commits_num desc")
|
|
|
|
# rep_statics_commit = @project.rep_statics.order("commits_num desc")
|
|
|
@ -335,20 +333,14 @@ class ProjectsController < ApplicationController
|
|
|
|
@a_commits_del = rep_statics_code.map {|s| s.del.to_i }
|
|
|
|
@a_commits_del = rep_statics_code.map {|s| s.del.to_i }
|
|
|
|
@a_commits_changeset = rep_statics_code.map {|s| s.changeset.to_i }
|
|
|
|
@a_commits_changeset = rep_statics_code.map {|s| s.changeset.to_i }
|
|
|
|
g = Gitlab.client
|
|
|
|
g = Gitlab.client
|
|
|
|
logger.debug "3"*100
|
|
|
|
|
|
|
|
begin
|
|
|
|
begin
|
|
|
|
gid = @project.gpid
|
|
|
|
gid = @project.gpid
|
|
|
|
logger.debug "31"*100
|
|
|
|
g_project = g.project(gid)
|
|
|
|
g_branch = g.project(gid)
|
|
|
|
g_branch = g_project.default_branch.to_s
|
|
|
|
logger.debug "4"*100
|
|
|
|
|
|
|
|
g_branch = g_branch.default_branch.to_s
|
|
|
|
|
|
|
|
logger.debug "5"*100
|
|
|
|
|
|
|
|
rescue =>e
|
|
|
|
rescue =>e
|
|
|
|
logger.error("get gitlab project failed: " + e)
|
|
|
|
logger.error("get default branch failed: " + e)
|
|
|
|
end
|
|
|
|
end
|
|
|
|
logger.debug "6"*100
|
|
|
|
|
|
|
|
@rev = g_branch.nil? ? "master" : g_branch
|
|
|
|
@rev = g_branch.nil? ? "master" : g_branch
|
|
|
|
logger.debug "7"*100
|
|
|
|
|
|
|
|
end
|
|
|
|
end
|
|
|
|
# 根据对应的请求,返回对应的数据
|
|
|
|
# 根据对应的请求,返回对应的数据
|
|
|
|
respond_to do |format|
|
|
|
|
respond_to do |format|
|
|
|
|