summaryrefslogtreecommitdiff
path: root/app/helpers/submodule_helper.rb
diff options
context:
space:
mode:
authorDmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>2015-03-25 15:37:04 +0000
committerDmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>2015-03-25 15:37:04 +0000
commitf729f6044717635ca2dfbe054fa863d068de5c98 (patch)
treeafa470aade5624c207ef79da6c88283ff1b720e7 /app/helpers/submodule_helper.rb
parentde9d51eea36a084376715f043ce3fc218ffd9855 (diff)
parent69454e36f77db6f6e1c45c04c39acf670fe443e4 (diff)
downloadgitlab-ce-f729f6044717635ca2dfbe054fa863d068de5c98.tar.gz
Merge branch 'more-rubocop-styles' into 'master'
More rubocop styles See merge request !449
Diffstat (limited to 'app/helpers/submodule_helper.rb')
-rw-r--r--app/helpers/submodule_helper.rb7
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