diff options
| author | Sebastian Ziebell <sebastian.ziebell@asquera.de> | 2013-02-08 10:32:42 +0100 |
|---|---|---|
| committer | Sebastian Ziebell <sebastian.ziebell@asquera.de> | 2013-02-08 10:32:42 +0100 |
| commit | 8045a81bcf5822f1992442750e1484a93c368229 (patch) | |
| tree | 94ce2b257f3ba002ac1a0fde70b69b622304810d /spec/spec_helper.rb | |
| parent | 5d8a99f10429168e6471fdd1843f5045a10a84b3 (diff) | |
| parent | 2f0a75ab77af430f682d67aa9bb865007d832795 (diff) | |
| download | gitlab-ce-8045a81bcf5822f1992442750e1484a93c368229.tar.gz | |
Merge branch 'master' into fixes/api
Diffstat (limited to 'spec/spec_helper.rb')
| -rw-r--r-- | spec/spec_helper.rb | 3 |
1 files changed, 0 insertions, 3 deletions
diff --git a/spec/spec_helper.rb b/spec/spec_helper.rb index dbac3c54901..bb314e60eb7 100644 --- a/spec/spec_helper.rb +++ b/spec/spec_helper.rb @@ -24,7 +24,6 @@ RSpec.configure do |config| config.mock_with :rspec config.include LoginHelpers, type: :request - config.include GitoliteStub config.include FactoryGirl::Syntax::Methods config.include Devise::TestHelpers, type: :controller @@ -34,8 +33,6 @@ RSpec.configure do |config| config.use_transactional_fixtures = false config.before do - stub_gitolite! - # Use tmp dir for FS manipulations temp_repos_path = Rails.root.join('tmp', 'test-git-base-path') Gitlab.config.gitolite.stub(repos_path: temp_repos_path) |