From f499904eca3aab37f59fc6010e11f666adc653a3 Mon Sep 17 00:00:00 2001
From: Jasper Maes <jaspermaes.jm@gmail.com>
Date: Sat, 18 Aug 2018 13:22:30 +0200
Subject: [PATCH] Rails5 fix duplicate gpg signature in path lock spec
---
ee/changelogs/unreleased/rails5-fix-path-lock-spec.yml | 5 +++++
ee/spec/features/projects/path_locks_spec.rb | 2 ++
2 files changed, 7 insertions(+)
create mode 100644 ee/changelogs/unreleased/rails5-fix-path-lock-spec.yml
diff --git a/ee/changelogs/unreleased/rails5-fix-path-lock-spec.yml b/ee/changelogs/unreleased/rails5-fix-path-lock-spec.yml
new file mode 100644
index 000000000000..1dbe2c553820
--- /dev/null
+++ b/ee/changelogs/unreleased/rails5-fix-path-lock-spec.yml
@@ -0,0 +1,5 @@
+---
+title: Rails5 fix duplicate gpg signature in path lock spec
+merge_request: 6939
+author: Jasper Maes
+type: fixed
diff --git a/ee/spec/features/projects/path_locks_spec.rb b/ee/spec/features/projects/path_locks_spec.rb
index eb38ddda618e..f533014e482e 100644
--- a/ee/spec/features/projects/path_locks_spec.rb
+++ b/ee/spec/features/projects/path_locks_spec.rb
@@ -12,6 +12,8 @@
sign_in(user)
visit tree_path
+
+ wait_for_requests
end
it 'Locking folders' do
--
GitLab