diff options
| author | Douwe Maan <douwe@gitlab.com> | 2015-12-03 13:29:19 +0100 |
|---|---|---|
| committer | Douwe Maan <douwe@gitlab.com> | 2015-12-03 13:29:19 +0100 |
| commit | 66a9579712a84061fa95d838760e8949538f44c8 (patch) | |
| tree | 2502e8f0edff0b30b66c7250b220c5d1f335ff4f /app/helpers/diff_helper.rb | |
| parent | acc35a58a7455a9107d6ebf2035f88350b1fb1ce (diff) | |
| parent | 6689224a90f3d2500be5d927ea1ed9656fc7b1b6 (diff) | |
| download | gitlab-ce-ui/sidebar.tar.gz | |
Merge branch 'master' into ui/sidebarui/sidebar
# Conflicts:
# app/assets/stylesheets/framework/sidebar.scss
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 [ |