diff options
author | Douwe Maan <douwe@selenight.nl> | 2017-05-26 13:51:24 -0500 |
---|---|---|
committer | Douwe Maan <douwe@selenight.nl> | 2017-05-26 13:51:24 -0500 |
commit | 2ae9c890e7037ec13b1882fda9ab90fc73f04fcc (patch) | |
tree | 1cb909e5ed6d9e3450d2d0e214d02a97981c97d2 /app/helpers/diff_helper.rb | |
parent | 33b622e353ba244ac62e61b6db0e382275ca905c (diff) | |
download | gitlab-ce-2ae9c890e7037ec13b1882fda9ab90fc73f04fcc.tar.gz |
Add experimental JSON format for tree controller
Diffstat (limited to 'app/helpers/diff_helper.rb')
-rw-r--r-- | app/helpers/diff_helper.rb | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/app/helpers/diff_helper.rb b/app/helpers/diff_helper.rb index 4c4fbdd4d39..407cb015988 100644 --- a/app/helpers/diff_helper.rb +++ b/app/helpers/diff_helper.rb @@ -88,15 +88,15 @@ module DiffHelper end def submodule_link(blob, ref, repository = @repository) - tree, commit = submodule_links(blob, ref, repository) - commit_id = if commit.nil? + project_url, tree_url = submodule_links(blob, ref, repository) + commit_id = if tree_url.nil? Commit.truncate_sha(blob.id) else - link_to Commit.truncate_sha(blob.id), commit + link_to Commit.truncate_sha(blob.id), tree_url end [ - content_tag(:span, link_to(truncate(blob.name, length: 40), tree)), + content_tag(:span, link_to(truncate(blob.name, length: 40), project_url)), '@', content_tag(:span, commit_id, class: 'commit-sha') ].join(' ').html_safe |