diff options
author | Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> | 2014-09-29 17:40:13 +0400 |
---|---|---|
committer | Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> | 2014-09-29 17:40:13 +0400 |
commit | 88b1e0ffcd27ab3d9ff9ce1fe5b493e3f6296b21 (patch) | |
tree | 1d79d32b2d5a73367a8fb6e101a8bcefff18e2a6 /app/controllers | |
parent | 2ebd2d41a52dd6401d86cb57a5f64372da968c41 (diff) |
Faster branch contains detection for commit
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
Diffstat (limited to 'app/controllers')
-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 34bd682bd90..66c67b661db 100644 --- a/app/controllers/projects/commit_controller.rb +++ b/app/controllers/projects/commit_controller.rb @@ -12,13 +12,7 @@ class Projects::CommitController < Projects::ApplicationController return git_not_found! unless @commit @line_notes = project.notes.for_commit_id(commit.id).inline - - @branches = begin - project.repository.branch_names_contains(commit.id) - rescue Grit::Git::GitTimeout - [] - end - + @branches = project.repository.branch_names_contains(commit.id) @diffs = @commit.diffs @note = project.build_commit_note(commit) @notes_count = project.notes.for_commit_id(commit.id).count |