jacknudt
/
socialforge
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge branch 'gitlab_guange' of http://repository.trustie.net/xianbo/trustie2 into gitlab_guange

This commit is contained in:
guange 2015-10-18 13:20:40 +08:00
parent 3a21e9f2b0 765d2b875d
commit 01d716d61f
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
app/controllers/repositories_controller.rb
View File

@ -259,13 +259,13 @@ update
#if( !User.current.member_of?(@project) || @project.hidden_repo) #if( !User.current.member_of?(@project) || @project.hidden_repo)
@repository.fetch_changesets if Setting.autofetch_changesets? && @path.empty? @repository.fetch_changesets if Setting.autofetch_changesets? && @path.empty?
g = Gitlab.client #g = Gitlab.client
project = g.project(11) #project = g.project(11)
# rr = g.trees(project.id, @path) # rr = g.trees(project.id, @path)
# r = g.get ("/projects/#{@project}/repository/tree") # r = g.get ("/projects/#{@project}/repository/tree")
# :name, :path, :kind, :size, :lastrev, :changeset # :name, :path, :kind, :size, :lastrev, :changeset
# @entries = @repository.entries(@path, @rev) @entries = @repository.entries(@path, @rev)
@entries = g.trees(project.id, @path) #@entries = g.trees(project.id, @path)
@changeset = @repository.find_changeset_by_name(@rev) @changeset = @repository.find_changeset_by_name(@rev)
#@project_path_cut = RepositoriesHelper::PROJECT_PATH_CUT #@project_path_cut = RepositoriesHelper::PROJECT_PATH_CUT