Merge branch 'rails5-fix-path-lock-spec' into 'master'

Rails5 fix duplicate gpg signature in path lock spec

See merge request gitlab-org/gitlab-ee!6939

ee/changelogs/unreleased/rails5-fix-path-lock-spec.yml

+---
+title: Rails5 fix duplicate gpg signature in path lock spec
+merge_request: 6939
+author: Jasper Maes
+type: fixed

ee/spec/features/projects/path_locks_spec.rb

@@ -12,6 +12,8 @@ describe 'Path Locks', :js do
     sign_in(user)
 
     visit tree_path
+
+    wait_for_requests
   end
 
   it 'Locking folders' do