From c34209534df4b4efeb1f4de5fba5462a0a60b4ab Mon Sep 17 00:00:00 2001 From: huang Date: Wed, 19 Oct 2016 15:51:55 +0800 Subject: [PATCH] =?UTF-8?q?=E7=89=88=E6=9C=AC=E5=BA=93=E5=B1=95=E5=BC=80?= =?UTF-8?q?=E6=96=87=E4=BB=B6=E7=9B=AE=E5=BD=95=E5=BC=82=E6=AD=A5=E5=88=B7?= =?UTF-8?q?=E6=96=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/controllers/projects_controller.rb | 4 ++-- app/views/repositories/_dir_list_content.html.erb | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/app/controllers/projects_controller.rb b/app/controllers/projects_controller.rb index bef1a3ac4..e0d65a111 100644 --- a/app/controllers/projects_controller.rb +++ b/app/controllers/projects_controller.rb @@ -664,11 +664,11 @@ class ProjectsController < ApplicationController # gpid, rev, ent_name, g def repository_tree_changes rev = params[:rev] - ent_name = params[:ent_name] + ent_path = params[:ent_path] gpid = params[:gpid] g = Gitlab.client begin - result = g.rep_last_changes(gpid, :rev => rev, :path => ent_name) + result = g.rep_last_changes(gpid, :rev => rev, :path => ent_path) # result.time = distance_of_time_in_words(result.time, Time.now) rescue Exception => e puts e diff --git a/app/views/repositories/_dir_list_content.html.erb b/app/views/repositories/_dir_list_content.html.erb index e1c610ecd..9a9e68750 100644 --- a/app/views/repositories/_dir_list_content.html.erb +++ b/app/views/repositories/_dir_list_content.html.erb @@ -49,7 +49,7 @@ $(document).ready(function(){ console.log("2222222222"); $.ajax({ - url:"<%= repository_tree_changes_project_path(@project, :rev => @rev, :ent_name => ent_name, :gpid => @project.gpid) %>", + url:"<%= repository_tree_changes_project_path(@project, :rev => @rev, :ent_path => ent_path, :gpid => @project.gpid) %>", type: "GET", data: "text", success:function(data){