diff options
| author | Achilleas Pipinellis <axilleas@axilleas.me> | 2016-03-12 19:27:28 +0200 |
|---|---|---|
| committer | Achilleas Pipinellis <axilleas@axilleas.me> | 2016-03-12 19:27:28 +0200 |
| commit | 8c543e6010c325d86b2fd6a3978596fd92441a71 (patch) | |
| tree | 9ae9951c525b9db955cd371f18bdcdbc411e7189 /spec/spec_helper.rb | |
| parent | 388f69b0de6450ec48a8b88df48bbe2d465593ea (diff) | |
| parent | a3b626bf2544a1ad98651a2a2c5cdd13dc934e12 (diff) | |
| download | gitlab-ce-8c543e6010c325d86b2fd6a3978596fd92441a71.tar.gz | |
Merge branch 'master' into gitlab-ci-yaml-updates
Diffstat (limited to 'spec/spec_helper.rb')
| -rw-r--r-- | spec/spec_helper.rb | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/spec/spec_helper.rb b/spec/spec_helper.rb index 159fb964171..7d939ca7509 100644 --- a/spec/spec_helper.rb +++ b/spec/spec_helper.rb @@ -14,7 +14,6 @@ require File.expand_path("../../config/environment", __FILE__) require 'rspec/rails' require 'shoulda/matchers' require 'sidekiq/testing/inline' -require 'benchmark/ips' require 'rspec/retry' # Requires supporting ruby files with custom matchers and macros, etc, @@ -38,7 +37,6 @@ RSpec.configure do |config| config.include ActiveJob::TestHelper config.include StubGitlabCalls config.include StubGitlabData - config.include BenchmarkMatchers, benchmark: true config.infer_spec_type_from_file_location! config.raise_errors_for_deprecations! |