From df8d2f8dd4accab180f0ba51395179109405e34f Mon Sep 17 00:00:00 2001 From: huang Date: Thu, 29 Oct 2015 14:20:23 +0800 Subject: [PATCH] =?UTF-8?q?gitlab=E8=B0=83=E7=94=A8commits=E6=8E=A5?= =?UTF-8?q?=E5=8F=A3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/controllers/repositories_controller.rb | 7 +++++-- config/locales/projects/zh.yml | 2 +- 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/app/controllers/repositories_controller.rb b/app/controllers/repositories_controller.rb index 742a02337..6497297ea 100644 --- a/app/controllers/repositories_controller.rb +++ b/app/controllers/repositories_controller.rb @@ -252,8 +252,11 @@ update else #Modified by young # (show_error_not_found; return) unless @entries - @changesets = @repository.latest_changesets(@path, @rev) - @changesets_count = @repository.latest_changesets(@path, @rev).count + g = Gitlab.client + p = g.project(@project.gpid) + @changesets = g.get ("/projects/#{p}/repository/commits") + # @changesets = @repository.latest_changesets(@path, @rev) + @changesets_count = @changesets.count @changesets_latest_coimmit = @changesets.first @properties = @repository.properties(@path, @rev) @repositories = @project.repositories diff --git a/config/locales/projects/zh.yml b/config/locales/projects/zh.yml index bd31c4d79..cce03b13e 100644 --- a/config/locales/projects/zh.yml +++ b/config/locales/projects/zh.yml @@ -375,7 +375,7 @@ zh: # label_project_new_description: '项目可以是软件开发项目,也可以是协作研究项目。' field_name: 名称 - field_identifier: 标识 + field_identifier: 版本库名 field_enterprise_name: 组织名称 label_organization_choose: --请选择组织-- text_length_between: "长度必须在 %{min} 到 %{max} 个字符之间。"