diff options
author | Douwe Maan <douwe@gitlab.com> | 2015-12-03 13:32:42 +0100 |
---|---|---|
committer | Douwe Maan <douwe@gitlab.com> | 2015-12-03 13:32:42 +0100 |
commit | 928d131e3974018581d561a7eb11d6524d2e79a2 (patch) | |
tree | 8f2c76dfe2576ed86e7850805ad6fd43f0b9c653 /app/helpers/diff_helper.rb | |
parent | 044e0e33dce9371430a3c91e63f9f687b536d35b (diff) | |
parent | 6689224a90f3d2500be5d927ea1ed9656fc7b1b6 (diff) | |
download | gitlab-ce-928d131e3974018581d561a7eb11d6524d2e79a2.tar.gz |
Merge branch 'master' into link-refs
Diffstat (limited to 'app/helpers/diff_helper.rb')
-rw-r--r-- | app/helpers/diff_helper.rb | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/app/helpers/diff_helper.rb b/app/helpers/diff_helper.rb index bfd3622a6a9..24134310fc5 100644 --- a/app/helpers/diff_helper.rb +++ b/app/helpers/diff_helper.rb @@ -146,9 +146,9 @@ module DiffHelper def submodule_link(blob, ref, repository = @repository) tree, commit = submodule_links(blob, ref, repository) commit_id = if commit.nil? - blob.id[0..10] + Commit.truncate_sha(blob.id) else - link_to "#{blob.id[0..10]}", commit + link_to Commit.truncate_sha(blob.id), commit end [ |