Merge branch 'lib-gitlab-git-version-popen' into 'master'

Remove Gitlab::Popen dependency from lib/gitlab/git

See merge request gitlab-org/gitlab-ce!19577

2 files changed, 12 insertions, 1 deletions

diff --git a/lib/gitlab/git.rb b/lib/gitlab/git.rb
index e85e87a54af..55236a1122f 100644
--- a/lib/gitlab/git.rb
+++ b/lib/gitlab/git.rb
@@ -62,7 +62,7 @@ module Gitlab
       end
 
       def version
-        Gitlab::VersionInfo.parse(Gitlab::Popen.popen(%W(#{Gitlab.config.git.bin_path} --version)).first)
+        Gitlab::Git::Version.git_version
       end
 
       def check_namespace!(*objects)
diff --git a/lib/gitlab/git/version.rb b/lib/gitlab/git/version.rb
new file mode 100644
index 00000000000..11184ca3457
--- /dev/null
+++ b/lib/gitlab/git/version.rb
@@ -0,0 +1,11 @@
+module Gitlab
+  module Git
+    module Version
+      extend Gitlab::Git::Popen
+
+      def self.git_version
+        Gitlab::VersionInfo.parse(popen(%W(#{Gitlab.config.git.bin_path} --version), nil).first)
+      end
+    end
+  end
+end