summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJacob Vosmaer <jacob@gitlab.com>2018-03-12 18:34:51 +0100
committerJacob Vosmaer <jacob@gitlab.com>2018-03-12 18:34:51 +0100
commitc4cb34cf3c85d4cd741f5982b6f4d7830df5c3dc (patch)
tree3a0eb3cb32a2e1b296bcf429f7e23002f89d0c72
parent6feee1ccc265c765181533bbc719f91c364de2b3 (diff)
downloadgitlab-shell-c4cb34cf3c85d4cd741f5982b6f4d7830df5c3dc.tar.gz
Don't force color via .rspec
-rw-r--r--.gitlab-ci.yml6
-rw-r--r--.rspec1
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:
diff --git a/.rspec b/.rspec
deleted file mode 100644
index 4e1e0d2..0000000
--- a/.rspec
+++ /dev/null
@@ -1 +0,0 @@
---color