From 71ea30a8621ad00f83826d46955d5768094bcae7 Mon Sep 17 00:00:00 2001
From: Alban Peignier
Date: Mon, 18 Dec 2017 12:03:48 +0100
Subject: Fix permission specs by including merges in Support::Permissions.
 Refs #5299

---
 spec/support/permissions.rb | 1 +
 1 file changed, 1 insertion(+)

(limited to 'spec/support')

diff --git a/spec/support/permissions.rb b/spec/support/permissions.rb
index dde530871..95afd6c1c 100644
--- a/spec/support/permissions.rb
+++ b/spec/support/permissions.rb
@@ -18,6 +18,7 @@ module Support
         calendars
         footnotes
         imports
+        merges
         journey_patterns
         referentials
         routes
-- 
cgit v1.2.3