diff options
| author | Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> | 2014-09-25 15:26:35 +0300 |
|---|---|---|
| committer | Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> | 2014-09-25 15:26:35 +0300 |
| commit | 619c81b4884ecfc33486007dd5e5324b08c0b0a8 (patch) | |
| tree | aa9da1af17595687256f6a252ede5084b131fd1a /app/controllers/projects/commit_controller.rb | |
| parent | 3a106cbcd3304ec20d936a9f3e2ec18715553d49 (diff) | |
| download | gitlab-ce-619c81b4884ecfc33486007dd5e5324b08c0b0a8.tar.gz | |
Fix Commit stats and diff encoding issues
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
Diffstat (limited to 'app/controllers/projects/commit_controller.rb')
| -rw-r--r-- | app/controllers/projects/commit_controller.rb | 8 |
1 files changed, 1 insertions, 7 deletions
diff --git a/app/controllers/projects/commit_controller.rb b/app/controllers/projects/commit_controller.rb index c344297ba8a..34bd682bd90 100644 --- a/app/controllers/projects/commit_controller.rb +++ b/app/controllers/projects/commit_controller.rb @@ -19,13 +19,7 @@ class Projects::CommitController < Projects::ApplicationController [] end - begin - @diffs = @commit.diffs - rescue Grit::Git::GitTimeout - @diffs = [] - @diff_timeout = true - end - + @diffs = @commit.diffs @note = project.build_commit_note(commit) @notes_count = project.notes.for_commit_id(commit.id).count @notes = project.notes.for_commit_id(@commit.id).not_inline.fresh |