summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorValery Sizov <vsv2711@gmail.com>2015-08-26 16:39:55 +0300
committerValery Sizov <vsv2711@gmail.com>2015-08-26 16:39:55 +0300
commit99b2be7625fe7849aa0559356beef86c1840fb65 (patch)
treec328b31041f38f2a5a0119f7e90ca5119dabb75e
parentbc03dfe774a5e6e5d95c01637c2968f54fec807f (diff)
downloadgitlab-ce-99b2be7625fe7849aa0559356beef86c1840fb65.tar.gz
Improve perofrmance of git blame
-rw-r--r--CHANGELOG1
-rw-r--r--app/views/projects/blame/show.html.haml2
2 files changed, 2 insertions, 1 deletions
diff --git a/CHANGELOG b/CHANGELOG
index be99941b4cd..dc1d88bf61e 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -18,6 +18,7 @@ v 8.0.0 (unreleased)
- Gracefully handle SMTP user input errors (e.g. incorrect email addresses) to prevent Sidekiq retries (Stan Hu)
- Improve abuse reports management from admin area
- Move dashboard activity to separate page
+ - Improve performance of git blame
v 7.14.1 (unreleased)
- Only include base URL in OmniAuth full_host parameter (Stan Hu)
diff --git a/app/views/projects/blame/show.html.haml b/app/views/projects/blame/show.html.haml
index a3ff7ce2f1f..c1ec42aefca 100644
--- a/app/views/projects/blame/show.html.haml
+++ b/app/views/projects/blame/show.html.haml
@@ -27,7 +27,7 @@
.light
= commit_author_link(commit, avatar: false)
authored
- #{time_ago_with_tooltip(commit.committed_date)}
+ #{time_ago_with_tooltip(commit.committed_date, skip_js: true)}
%td.lines.blame-numbers
%pre
- line_count = blame_group[:lines].count