diff options
author | Robert Speicher <robert@gitlab.com> | 2018-03-12 17:40:08 +0000 |
---|---|---|
committer | Robert Speicher <robert@gitlab.com> | 2018-03-12 17:40:08 +0000 |
commit | a79dbea444b2aaae148be1846b018cbd060321d4 (patch) | |
tree | 3a0eb3cb32a2e1b296bcf429f7e23002f89d0c72 | |
parent | 6feee1ccc265c765181533bbc719f91c364de2b3 (diff) | |
parent | c4cb34cf3c85d4cd741f5982b6f4d7830df5c3dc (diff) | |
download | gitlab-shell-a79dbea444b2aaae148be1846b018cbd060321d4.tar.gz |
Merge branch 'remove-.rspec' into 'master'
Don't force color via .rspec
See merge request gitlab-org/gitlab-shell!194
-rw-r--r-- | .gitlab-ci.yml | 6 | ||||
-rw-r--r-- | .rspec | 1 |
2 files changed, 3 insertions, 4 deletions
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 18648f8..162d3e9 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -10,7 +10,7 @@ before_script: rspec: script: - - bundle exec rspec -f d spec + - bundle exec rspec --color --format d spec tags: - ruby except: @@ -28,7 +28,7 @@ rubocop: rspec:ruby2.2: image: ruby:2.2 script: - - bundle exec rspec -f d spec + - bundle exec rspec --color --format d spec tags: - ruby except: @@ -38,7 +38,7 @@ rspec:ruby2.2: rspec:ruby2.1: image: ruby:2.1 script: - - bundle exec rspec -f d spec + - bundle exec rspec --color --format d spec tags: - ruby except: @@ -1 +0,0 @@ ---color |