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

app/controllers/repositories_controller.rb

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