diff options
author | GitLab Bot <gitlab-bot@gitlab.com> | 2020-01-27 15:08:35 +0300 |
---|---|---|
committer | GitLab Bot <gitlab-bot@gitlab.com> | 2020-01-27 15:08:35 +0300 |
commit | 22e9af3c8b8aedf7f46b786be968862b74a2d07e (patch) | |
tree | a10a7d9af40a17fe6cda7b3a681f5e5e2112c16e /app/helpers/submodule_helper.rb | |
parent | c8e28a0bb8dd45d91cb72ff2c930bc4a562f1fc7 (diff) |
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'app/helpers/submodule_helper.rb')
-rw-r--r-- | app/helpers/submodule_helper.rb | 13 |
1 files changed, 9 insertions, 4 deletions
diff --git a/app/helpers/submodule_helper.rb b/app/helpers/submodule_helper.rb index 9707a5cef3b..32c613ab4ad 100644 --- a/app/helpers/submodule_helper.rb +++ b/app/helpers/submodule_helper.rb @@ -39,9 +39,9 @@ module SubmoduleHelper elsif relative_self_url?(url) relative_self_links(url, submodule_item_id, repository.project) elsif github_dot_com_url?(url) - standard_links('github.com', namespace, project, submodule_item_id) + github_com_tree_links(namespace, project, submodule_item_id) elsif gitlab_dot_com_url?(url) - standard_links('gitlab.com', namespace, project, submodule_item_id) + gitlab_com_tree_links(namespace, project, submodule_item_id) else [sanitize_submodule_url(url), nil] end @@ -73,8 +73,13 @@ module SubmoduleHelper url.start_with?('../', './') end - def standard_links(host, namespace, project, commit) - base = ['https://', host, '/', namespace, '/', project].join('') + def gitlab_com_tree_links(namespace, project, commit) + base = ['https://gitlab.com/', namespace, '/', project].join('') + [base, [base, '/-/tree/', commit].join('')] + end + + def github_com_tree_links(namespace, project, commit) + base = ['https://github.com/', namespace, '/', project].join('') [base, [base, '/tree/', commit].join('')] end |