summaryrefslogtreecommitdiff
path: root/app/helpers/diff_helper.rb
diff options
context:
space:
mode:
authorHeadless <skv-headless@yandex.ru>2015-01-19 16:07:37 +0300
committerHeadless <skv-headless@yandex.ru>2015-01-19 17:18:08 +0300
commit3d2aaa169ea7cfa8d416103c70711a440c716dd9 (patch)
tree23a9633117a3dab5ddc157acccea39bf1f3a5839 /app/helpers/diff_helper.rb
parent2fba31890e922fa8bae61e7aa3f21c5b4314e735 (diff)
downloadgitlab-ce-3d2aaa169ea7cfa8d416103c70711a440c716dd9.tar.gz
show diff in submodules
Diffstat (limited to 'app/helpers/diff_helper.rb')
-rw-r--r--app/helpers/diff_helper.rb15
1 files changed, 15 insertions, 0 deletions
diff --git a/app/helpers/diff_helper.rb b/app/helpers/diff_helper.rb
index a15af0be01a..8c921cba543 100644
--- a/app/helpers/diff_helper.rb
+++ b/app/helpers/diff_helper.rb
@@ -135,4 +135,19 @@ module DiffHelper
'Side-by-side'
end
end
+
+ def submodule_link(blob, ref)
+ tree, commit = submodule_links(blob, ref)
+ commit_id = if commit.nil?
+ blob.id[0..10]
+ else
+ link_to "#{blob.id[0..10]}", commit
+ end
+
+ [
+ content_tag(:span, link_to(truncate(blob.name, length: 40), tree)),
+ '@',
+ content_tag(:span, commit_id, class: 'monospace'),
+ ].join(' ').html_safe
+ end
end