summaryrefslogtreecommitdiff
path: root/lib/gitlab/popen.rb
diff options
context:
space:
mode:
authorgfyoung <gfyoung17+gitlab@gmail.com>2018-10-22 07:00:50 +0000
committerRémy Coutable <remy@rymai.me>2018-10-22 07:00:50 +0000
commitc858f70d076dc44f6bf1ab1f7acb1fc13a12ab1b (patch)
tree40fa82826cf182f47b1c905e738c8ee955ad14c2 /lib/gitlab/popen.rb
parent173b1436b1622b85d4a81e3577c6492cbb93a8b8 (diff)
downloadgitlab-ce-c858f70d076dc44f6bf1ab1f7acb1fc13a12ab1b.tar.gz
Enable frozen string for lib/gitlab/*.rb
Diffstat (limited to 'lib/gitlab/popen.rb')
-rw-r--r--lib/gitlab/popen.rb4
1 files changed, 3 insertions, 1 deletions
diff --git a/lib/gitlab/popen.rb b/lib/gitlab/popen.rb
index d0cb7c1a7cf..7fa00d0c68c 100644
--- a/lib/gitlab/popen.rb
+++ b/lib/gitlab/popen.rb
@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
require 'fileutils'
require 'open3'
@@ -11,7 +13,7 @@ module Gitlab
def popen(cmd, path = nil, vars = {}, &block)
result = popen_with_detail(cmd, path, vars, &block)
- [result.stdout << result.stderr, result.status&.exitstatus]
+ ["#{result.stdout}#{result.stderr}", result.status&.exitstatus]
end
# Returns Result