diff options
| author | Robert Speicher <robert@gitlab.com> | 2017-05-10 21:43:34 +0000 |
|---|---|---|
| committer | Robert Speicher <robert@gitlab.com> | 2017-05-10 21:43:34 +0000 |
| commit | cb2f739d4844af094f62edb4e4dff1b3413a405b (patch) | |
| tree | c86ea111756a89d84e0601d554ddc78d3be780d0 /lib/gitlab/kubernetes.rb | |
| parent | 000045e6647fd8c2e28b1a6dc12ce59f9bfc054f (diff) | |
| parent | 3db37e05622aa3daa2be41bb9edc486cd2e54bcd (diff) | |
| download | gitlab-ce-cb2f739d4844af094f62edb4e4dff1b3413a405b.tar.gz | |
Merge branch '27144-enforce-rubocop-trailing_commas-no_comma-style' into 'master'
Resolve "Use consistent style for trailing commas"
Closes #27144
See merge request !11063
Diffstat (limited to 'lib/gitlab/kubernetes.rb')
| -rw-r--r-- | lib/gitlab/kubernetes.rb | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/lib/gitlab/kubernetes.rb b/lib/gitlab/kubernetes.rb index 3a7af363548..4a6091488c8 100644 --- a/lib/gitlab/kubernetes.rb +++ b/lib/gitlab/kubernetes.rb @@ -38,7 +38,7 @@ module Gitlab url: container_exec_url(api_url, namespace, pod_name, container["name"]), subprotocols: ['channel.k8s.io'], headers: Hash.new { |h, k| h[k] = [] }, - created_at: created_at, + created_at: created_at } end end @@ -64,7 +64,7 @@ module Gitlab tty: true, stdin: true, stdout: true, - stderr: true, + stderr: true }.to_query + '&' + EXEC_COMMAND case url.scheme |