summaryrefslogtreecommitdiff
path: root/app/controllers/projects/commit_controller.rb
diff options
context:
space:
mode:
authorRubén Dávila <rdavila84@gmail.com>2016-01-13 18:01:40 -0500
committerRubén Dávila <rdavila84@gmail.com>2016-01-13 18:01:40 -0500
commit1161cf2ec610cb0ceba61c92180566c9786ab059 (patch)
tree46a076981b29202cfa3908d0ec15d62041789277 /app/controllers/projects/commit_controller.rb
parent0f0af19139db71255934e9a7a5b5cd86420b7186 (diff)
downloadgitlab-ce-1161cf2ec610cb0ceba61c92180566c9786ab059.tar.gz
Use current commit id if it doesn't have a parent. #3945
Diffstat (limited to 'app/controllers/projects/commit_controller.rb')
-rw-r--r--app/controllers/projects/commit_controller.rb2
1 files changed, 1 insertions, 1 deletions
diff --git a/app/controllers/projects/commit_controller.rb b/app/controllers/projects/commit_controller.rb
index 9bbf4581057..c8f143dd6b4 100644
--- a/app/controllers/projects/commit_controller.rb
+++ b/app/controllers/projects/commit_controller.rb
@@ -72,7 +72,7 @@ class Projects::CommitController < Projects::ApplicationController
@diffs = commit.diffs
end
- @diff_refs = [commit.parent.id, commit.id]
+ @diff_refs = [commit.parent_id || commit.id, commit.id]
@notes_count = commit.notes.count
@statuses = ci_commit.statuses if ci_commit