summaryrefslogtreecommitdiff
path: root/app/helpers/diff_helper.rb
diff options
context:
space:
mode:
authorDouwe Maan <douwe@gitlab.com>2015-12-03 13:21:19 +0100
committerDouwe Maan <douwe@gitlab.com>2015-12-03 13:21:19 +0100
commit0520cd716435afa36204dd882f9cb7a23f81b11d (patch)
tree39228fbaef420e8ef70c41e84322d0c5aea041e0 /app/helpers/diff_helper.rb
parent129ad8425e8fcbb1d7025e247d29772831d76b06 (diff)
parent6689224a90f3d2500be5d927ea1ed9656fc7b1b6 (diff)
downloadgitlab-ce-0520cd716435afa36204dd882f9cb7a23f81b11d.tar.gz
Merge branch 'master' into ui/form-consistency
Diffstat (limited to 'app/helpers/diff_helper.rb')
-rw-r--r--app/helpers/diff_helper.rb4
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
[