Commit 647901b3 authored by Rémy Coutable's avatar Rémy Coutable

Merge branch 'sh-upgrade-to-ruby-2.6.3' into 'master'

Upgrade to Ruby 2.6.3

See merge request gitlab-org/gitlab-shell!298
parents 0e3052be 2fef8e45
...@@ -33,6 +33,17 @@ rubocop: ...@@ -33,6 +33,17 @@ rubocop:
except: except:
- tags - tags
#ruby 2.6
rspec:ruby2.6:
image: ruby:2.6
variables:
INSTALL_BUNDLER_VERSION: ~> 1.17.3
<<: *rspec_definition
tags:
- ruby
except:
- tags
#ruby 2.2 #ruby 2.2
rspec:ruby2.2: rspec:ruby2.2:
image: ruby:2.2 image: ruby:2.2
......
# Exclude some of GitLab files # Exclude some of GitLab files
AllCops: AllCops:
TargetRubyVersion: 2.3
Exclude: Exclude:
- 'spec/**/*' - 'spec/**/*'
- 'vendor/**/*' - 'vendor/**/*'
......
...@@ -46,6 +46,6 @@ http_interactions: ...@@ -46,6 +46,6 @@ http_interactions:
- '1.436040' - '1.436040'
body: body:
encoding: UTF-8 encoding: UTF-8
string: '""' string: '{'
http_version: http_version:
recorded_at: Fri, 20 Jul 2018 06:18:58 GMT recorded_at: Fri, 20 Jul 2018 06:18:58 GMT
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment