summaryrefslogtreecommitdiff
path: root/spec/features/auto_deploy_spec.rb
diff options
context:
space:
mode:
authorRémy Coutable <remy@rymai.me>2017-04-24 18:06:47 +0200
committerRémy Coutable <remy@rymai.me>2017-04-24 18:06:47 +0200
commit3855751d024d20a05343141c65aa3b588645dcfa (patch)
tree1d8ad1eea271f2956532c651af3b2e5cfc9e5c46 /spec/features/auto_deploy_spec.rb
parent9d17ad1048779c3e8ff5f8af4d6497a1140cfe33 (diff)
parentff76adb5476f663fe92cec0ec4a78e93c7615191 (diff)
downloadgitlab-ce-3855751d024d20a05343141c65aa3b588645dcfa.tar.gz
Merge branch 'jacopo-beschi/gitlab-ce-29712-unnecessary-wait-for-ajax'
See merge request !10567 Signed-off-by: Rémy Coutable <remy@rymai.me>
Diffstat (limited to 'spec/features/auto_deploy_spec.rb')
-rw-r--r--spec/features/auto_deploy_spec.rb2
1 files changed, 0 insertions, 2 deletions
diff --git a/spec/features/auto_deploy_spec.rb b/spec/features/auto_deploy_spec.rb
index f6f0f6d6233..67b0f006854 100644
--- a/spec/features/auto_deploy_spec.rb
+++ b/spec/features/auto_deploy_spec.rb
@@ -1,8 +1,6 @@
require 'spec_helper'
describe 'Auto deploy' do
- include WaitForAjax
-
let(:user) { create(:user) }
let(:project) { create(:project, :repository) }