servactory 2.5.0.rc1 → 2.5.0.rc2

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
checksums.yaml CHANGED
@@ -1,7 +1,7 @@
1
1
  ---
2
2
  SHA256:
3
- metadata.gz: 46aa75596d1b4afaef52eb55ad99884c13f7c2b62d5d264a54e88c4d840f8588
4
- data.tar.gz: a40bdcc6ab7922f6358c94502683854b3897930633f90656a498798e74804606
3
+ metadata.gz: ce8eb77c5347f231539b115081d7706f6546830ccda8269e414ba05d097d3d85
4
+ data.tar.gz: 3393084486439b10177a5a13eb4826f4b2ab19c21aefbe92a23aaa7c5ce0096c
5
5
  SHA512:
6
- metadata.gz: b14c88eed72b89ab6fa6a9e37e7403466c14def2265df8a75b496700b3cb57ab7e19407b1564bd48bb01a180ec05ca07c473ae32e904a048c7bbb6b052f06507
7
- data.tar.gz: 3112d0f9f1f03e00f64c5e2e36c0c503b3c4854fe12b7f6e961eec679135263e05d804384a7e0e269dee0681817174d0917a4b0022e93bdb6f6a2cb215bd3ae7
6
+ metadata.gz: 4ae8873bb459d8bedac4d64cee6ca8f4049e57fd87f62e3842b47e5f20415196cc6470704e3d9fd1d2c380e75ae2ffdcd5f93ad5dfc87e677b259ef215d8974b
7
+ data.tar.gz: c0a37302c68b09fa238656f88bcdd536bb81d1a5f47db60ac8de52d7455d534b3622cbcd5568474e7d303b86bb7a6f5219f1f7e5fa0c7a5a0833d955194406d9
@@ -225,9 +225,6 @@ module Servactory
225
225
  )
226
226
  ],
227
227
  define_conflicts: [
228
- Servactory::Maintenance::Attributes::DefineConflict.new(
229
- content: -> { :prepare_vs_collection if @attribute.prepare_present? && @attribute.collection_mode? }
230
- ),
231
228
  Servactory::Maintenance::Attributes::DefineConflict.new(
232
229
  content: -> { :prepare_vs_inclusion if @attribute.prepare_present? && @attribute.inclusion_present? }
233
230
  ),
@@ -5,7 +5,7 @@ module Servactory
5
5
  MAJOR = 2
6
6
  MINOR = 5
7
7
  PATCH = 0
8
- PRE = "rc1"
8
+ PRE = "rc2"
9
9
 
10
10
  STRING = [MAJOR, MINOR, PATCH, PRE].compact.join(".")
11
11
  end
metadata CHANGED
@@ -1,7 +1,7 @@
1
1
  --- !ruby/object:Gem::Specification
2
2
  name: servactory
3
3
  version: !ruby/object:Gem::Version
4
- version: 2.5.0.rc1
4
+ version: 2.5.0.rc2
5
5
  platform: ruby
6
6
  authors:
7
7
  - Anton Sokolov