aboutsummaryrefslogtreecommitdiffstats
path: root/config/initializers
diff options
context:
space:
mode:
authorAlban Peignier2017-12-14 11:09:05 +0100
committerAlban Peignier2018-01-05 10:22:59 +0100
commit638a1864a027226c9c0b26b01ca80a85435387f7 (patch)
tree133c131ea10a3635e91a6d7d64b9a00cb97c9e92 /config/initializers
parent63c8ca8680c9d77032abde84c7a5d969545d675a (diff)
downloadchouette-core-638a1864a027226c9c0b26b01ca80a85435387f7.tar.bz2
Create Merge operation. Refs #5299
Diffstat (limited to 'config/initializers')
-rw-r--r--config/initializers/apartment.rb3
1 files changed, 2 insertions, 1 deletions
diff --git a/config/initializers/apartment.rb b/config/initializers/apartment.rb
index 69204a5d7..8becd23c2 100644
--- a/config/initializers/apartment.rb
+++ b/config/initializers/apartment.rb
@@ -77,7 +77,8 @@ Apartment.configure do |config|
'ComplianceCheckSet',
'ComplianceCheckBlock',
'ComplianceCheckResource',
- 'ComplianceCheckMessage'
+ 'ComplianceCheckMessage',
+ 'Merge'
]
# use postgres schemas?