aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAlban Peignier2017-12-18 12:03:48 +0100
committerAlban Peignier2018-01-05 10:23:29 +0100
commit71ea30a8621ad00f83826d46955d5768094bcae7 (patch)
treeabb1bd9deaccc01a30d9310568b41d1c3259d556
parent7d15657860db6d1836c863180ee84524a5bdeb61 (diff)
downloadchouette-core-71ea30a8621ad00f83826d46955d5768094bcae7.tar.bz2
Fix permission specs by including merges in Support::Permissions. Refs #5299
-rw-r--r--spec/support/permissions.rb1
1 files changed, 1 insertions, 0 deletions
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