diff options
| author | Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> | 2015-08-26 14:19:53 +0000 |
|---|---|---|
| committer | Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> | 2015-08-26 14:19:53 +0000 |
| commit | 626c6f9730cb11c953753c755968669915d25855 (patch) | |
| tree | c328b31041f38f2a5a0119f7e90ca5119dabb75e | |
| parent | bc03dfe774a5e6e5d95c01637c2968f54fec807f (diff) | |
| parent | 99b2be7625fe7849aa0559356beef86c1840fb65 (diff) | |
| download | gitlab-ce-626c6f9730cb11c953753c755968669915d25855.tar.gz | |
Merge branch 'blame_fix' into 'master'
Improve perofrmance of git blame
https://gitlab.com/gitlab-org/gitlab-ce/issues/2286
Now, it's four times as faster.
See merge request !1209
| -rw-r--r-- | CHANGELOG | 1 | ||||
| -rw-r--r-- | app/views/projects/blame/show.html.haml | 2 |
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 |