From a5193cd266e86063395369df26ce7b340c8b9fa3 Mon Sep 17 00:00:00 2001 From: huang Date: Tue, 1 Nov 2016 15:24:02 +0800 Subject: [PATCH] =?UTF-8?q?=E7=89=88=E6=9C=AC=E5=BA=93=E6=98=BE=E7=A4=BA?= =?UTF-8?q?=E8=B0=83=E6=95=B4=EF=BC=8C=E5=8F=8A=E6=B1=89=E5=AD=97=E5=A7=93?= =?UTF-8?q?=E5=90=8D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/controllers/projects_controller.rb | 2 +- app/views/repositories/_dir_list_content.html.erb | 11 ++++++----- public/stylesheets/css/project.css | 4 ++-- 3 files changed, 9 insertions(+), 8 deletions(-) diff --git a/app/controllers/projects_controller.rb b/app/controllers/projects_controller.rb index d23203c9f..b1007ac8b 100644 --- a/app/controllers/projects_controller.rb +++ b/app/controllers/projects_controller.rb @@ -671,7 +671,7 @@ class ProjectsController < ApplicationController g = Gitlab.client begin result = g.rep_last_changes(gpid, :rev => rev, :path => ent_path) - result = {:message => result.message, :author_name => User.find_by_login(result.author_name).nil? ? result.author_name : User.find_by_login(result.author_name).show_name, :time => distance_of_time_in_words(result.time, Time.now)} + result = {:message => result.message, :author_name => User.find_by_mail(result.author_email).nil? ? result.author_email : User.find_by_mail(result.author_email).show_name, :time => distance_of_time_in_words(result.time, Time.now)} rescue Exception => e puts e end diff --git a/app/views/repositories/_dir_list_content.html.erb b/app/views/repositories/_dir_list_content.html.erb index 9a9e68750..287eabfbf 100644 --- a/app/views/repositories/_dir_list_content.html.erb +++ b/app/views/repositories/_dir_list_content.html.erb @@ -25,16 +25,17 @@ :class => (entry.is_dir? ? 'icon icon-folder' : "icon icon-file #{Redmine::MimeType.css_class_of(ent_name)}")%>
- - - + + + +