From a21200ab14a89989e3695184765b268edd76552b Mon Sep 17 00:00:00 2001 From: huang Date: Fri, 15 Apr 2016 15:53:29 +0800 Subject: [PATCH] =?UTF-8?q?=E5=8A=A8=E6=80=81=E4=B8=AD=E6=B7=BB=E5=8A=A0?= =?UTF-8?q?=E5=88=86=E6=94=AF?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/controllers/projects_controller.rb | 8 +++++++- app/views/projects/_rep_static.html.erb | 2 +- 2 files changed, 8 insertions(+), 2 deletions(-) diff --git a/app/controllers/projects_controller.rb b/app/controllers/projects_controller.rb index 7553acdbc..e9151c473 100644 --- a/app/controllers/projects_controller.rb +++ b/app/controllers/projects_controller.rb @@ -329,7 +329,13 @@ class ProjectsController < ApplicationController @a_commits_add = rep_statics_code.map {|s| s.add.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 } - # @static_total_per_user = g.rep_stats(@project.gpid) + g = Gitlab.client + begin + g_branch = g.project(@project.gpid).default_branch.to_s + rescue + logger.error("get gitlab project failed!") + end + @rev = g_branch.nil? ? "master" : g_branch end # 根据对应的请求,返回对应的数据 respond_to do |format| diff --git a/app/views/projects/_rep_static.html.erb b/app/views/projects/_rep_static.html.erb index 86d557f3a..9ebf68d0c 100644 --- a/app/views/projects/_rep_static.html.erb +++ b/app/views/projects/_rep_static.html.erb @@ -178,4 +178,4 @@ }); }); -
当前分支:develop
\ No newline at end of file +
当前分支:<%= @rev %>
\ No newline at end of file