summaryrefslogtreecommitdiff
path: root/features
diff options
context:
space:
mode:
authorDmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>2015-06-04 17:54:33 +0000
committerDmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>2015-06-04 17:54:33 +0000
commitbedc66eb0407aa36127367f53f76944ebb98f5a6 (patch)
tree0c2bae4b8a4d318c8c222f338d017163d87160da /features
parent32ba92a7e242f6cb41eea09175f3d1d8fa442a2d (diff)
parent44396e44a3c434eb260cfd928cc9fa544df288c3 (diff)
downloadgitlab-ce-bedc66eb0407aa36127367f53f76944ebb98f5a6.tar.gz
Merge branch 'rs-remove-guard' into 'master'
Remove Guard None of the GitLab B.V. developers were using it. See internal https://dev.gitlab.org/gitlab/gitlabhq/issues/2360 See merge request !764
Diffstat (limited to 'features')
-rw-r--r--features/support/env.rb1
1 files changed, 0 insertions, 1 deletions
diff --git a/features/support/env.rb b/features/support/env.rb
index f34302721ed..d4a878ea4ce 100644
--- a/features/support/env.rb
+++ b/features/support/env.rb
@@ -9,7 +9,6 @@ end
ENV['RAILS_ENV'] = 'test'
require './config/environment'
-require 'rspec'
require 'rspec/expectations'
require 'sidekiq/testing/inline'