summaryrefslogtreecommitdiff
path: root/app/helpers/submodule_helper.rb
diff options
context:
space:
mode:
authorDouwe Maan <douwe@selenight.nl>2017-05-26 13:51:24 -0500
committerJacob Schatz <jschatz1@gmail.com>2017-06-13 21:33:26 -0400
commitd9b15661c97c471a1fa880a84fb6f1d6d4a2a2a5 (patch)
tree9af3da7b47fcc89e1f369a506403fd9763c0c024 /app/helpers/submodule_helper.rb
parent0037cf634dbcc8045fba9cbc28133cfde07dc97c (diff)
downloadgitlab-ce-d9b15661c97c471a1fa880a84fb6f1d6d4a2a2a5.tar.gz
Add experimental JSON format for tree controller
Diffstat (limited to 'app/helpers/submodule_helper.rb')
-rw-r--r--app/helpers/submodule_helper.rb4
1 files changed, 2 insertions, 2 deletions
diff --git a/app/helpers/submodule_helper.rb b/app/helpers/submodule_helper.rb
index 8e0a1e2ecdf..a7dc1643e79 100644
--- a/app/helpers/submodule_helper.rb
+++ b/app/helpers/submodule_helper.rb
@@ -1,5 +1,5 @@
module SubmoduleHelper
- include Gitlab::ShellAdapter
+ extend self
VALID_SUBMODULE_PROTOCOLS = %w[http https git ssh].freeze
@@ -59,7 +59,7 @@ module SubmoduleHelper
return true if url_no_dotgit == [Gitlab.config.gitlab.url, '/', namespace, '/',
project].join('')
url_with_dotgit = url_no_dotgit + '.git'
- url_with_dotgit == gitlab_shell.url_to_repo([namespace, '/', project].join(''))
+ url_with_dotgit == Gitlab::Shell.new.url_to_repo([namespace, '/', project].join(''))
end
def relative_self_url?(url)