diff options
| author | Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> | 2015-03-25 08:37:28 -0700 |
|---|---|---|
| committer | Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> | 2015-03-25 08:37:28 -0700 |
| commit | eda120dc4d8599e293afec7789847fd22ca0c1b0 (patch) | |
| tree | ff008fc6295433fe6f54f62b89c18dd92b89a278 /app/helpers/submodule_helper.rb | |
| parent | d554070a62b0bc34ab2289d4a071b950df4d5485 (diff) | |
| parent | f729f6044717635ca2dfbe054fa863d068de5c98 (diff) | |
| download | gitlab-ce-eda120dc4d8599e293afec7789847fd22ca0c1b0.tar.gz | |
Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ce
Diffstat (limited to 'app/helpers/submodule_helper.rb')
| -rw-r--r-- | app/helpers/submodule_helper.rb | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/app/helpers/submodule_helper.rb b/app/helpers/submodule_helper.rb index 525266fb3b5..241462e5e4c 100644 --- a/app/helpers/submodule_helper.rb +++ b/app/helpers/submodule_helper.rb @@ -49,7 +49,7 @@ module SubmoduleHelper def standard_links(host, namespace, project, commit) base = [ 'https://', host, '/', namespace, '/', project ].join('') - return base, [ base, '/tree/', commit ].join('') + [base, [ base, '/tree/', commit ].join('')] end def relative_self_links(url, commit) @@ -58,7 +58,10 @@ module SubmoduleHelper else base = [ @project.group.path, '/', url[/([^\/]*)\.git/, 1] ].join('') end - return namespace_project_path(base.namespace, base), + + [ + namespace_project_path(base.namespace, base), namespace_project_tree_path(base.namespace, base, commit) + ] end end |