servactory 2.5.0.rc4 → 2.5.0.rc5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: '03950ff6fd385cfe8ba4506f2eb4dc7c2dc94dcf838d2a10b783e25e6b290af6'
-  data.tar.gz: 64182d91fa7a9042cefb99ec422d3710761f8ab412a8b00184c324bae23debfb
+  metadata.gz: 81e8630b2ea211b5dc7e84b9fdb0a3617a1f6d6dd4dc257eedd1b654b79af5d5
+  data.tar.gz: 2f91e9ecb08c940be78d22e2b737af42470fd0c9ec593a4bb8eae1f4905d0fa7
 SHA512:
-  metadata.gz: f85e47114458349c416a1a64d69098d29a67b8d837025acff53acc91885225c9ecab6036422fcd269793f5cdd22a90fe6ba0b8899074dde10837a6e0989b0cc3
-  data.tar.gz: 96bfba7a9fdc2c763ed8ab4b355a966053fa2a1f0e7bd365bbaa7f51dda089edc30ed00a61566e25252fa12df07eac7e327fb814d5dcb6b77d474f5e3718e1e7
+  metadata.gz: f7b5ebee2a8041b78007a610b13b247df76382d33eae9f47b6d2fb2f443a1f25a67805815a756712b0f179867ee8485b3eaee61e6c03ebd4b51e0125578f77a3
+  data.tar.gz: 1c9df4f3145e43768edfec44bf9e49d8eebd22a5d213f71d7b938be2871dfcc927e544ae5e3856f0183ac12f3ceb382ef7153c20e11a4f8b4d551a37bad0aaba

data/lib/servactory/maintenance/attributes/options/registrar.rb

@@ -227,9 +227,6 @@ module Servactory
               define_conflicts: [
                 Servactory::Maintenance::Attributes::DefineConflict.new(
                   content: -> { :prepare_vs_inclusion if @attribute.prepare_present? && @attribute.inclusion_present? }
-                ),
-                Servactory::Maintenance::Attributes::DefineConflict.new(
-                  content: -> { :prepare_vs_must if @attribute.prepare_present? && @attribute.must_present? }
                 )
               ],
               need_for_checks: false,

data/lib/servactory/version.rb

@@ -5,7 +5,7 @@ module Servactory
     MAJOR = 2
     MINOR = 5
     PATCH = 0
-    PRE = "rc4"
+    PRE = "rc5"
 
     STRING = [MAJOR, MINOR, PATCH, PRE].compact.join(".")
   end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: servactory
 version: !ruby/object:Gem::Version
-  version: 2.5.0.rc4
+  version: 2.5.0.rc5
 platform: ruby
 authors:
 - Anton Sokolov