Skip to content

Commit a108a5c

Browse files
Merge pull request rails#45396 from deepakmahakale/fix-code-formatting
docs: Fix breaking code block formatting [ci-skip]
2 parents ed3130a + 7f73db7 commit a108a5c

File tree

1 file changed

+10
-2
lines changed

1 file changed

+10
-2
lines changed

guides/source/upgrading_ruby_on_rails.md

Lines changed: 10 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -100,7 +100,8 @@ The `MessageEncryptor` offers the ability to migrate the default serializer from
100100
If you would like to ignore this change in existing applications, set the following: `config.active_support.default_message_encryptor_serializer = :marshal`.
101101

102102
In order to roll out the new default when upgrading from `7.0` to `7.1`, there are three configuration variables to keep in mind.
103-
```
103+
104+
```ruby
104105
config.active_support.default_message_encryptor_serializer
105106
config.active_support.fallback_to_marshal_deserialization
106107
config.active_support.use_marshal_serialization
@@ -109,6 +110,7 @@ config.active_support.use_marshal_serialization
109110
`default_message_encryptor_serializer` defaults to `:json` as of `7.1` but it offers both a `:hybrid` and `:marshal` option.
110111

111112
In order to migrate an older deployment to `:json`, first ensure that the `default_message_encryptor_serializer` is set to `:marshal`.
113+
112114
```ruby
113115
# config/application.rb
114116
config.load_defaults 7.0
@@ -137,6 +139,7 @@ config.active_support.use_marshal_serialization = false
137139
Allow this configuration to run on all processes for a considerable amount of time.
138140
`ActiveSupport::JsonWithMarshalFallback` logs the following each time the `Marshal` fallback
139141
is used:
142+
140143
```
141144
JsonWithMarshalFallback: Marshal load fallback occurred.
142145
```
@@ -164,6 +167,7 @@ config.active_support.default_message_encryptor_serializer = :json
164167
```
165168

166169
Alternatively, you could load defaults for 7.1
170+
167171
```ruby
168172
# config/application.rb
169173
config.load_defaults 7.1
@@ -179,7 +183,8 @@ The `MessageVerifier` offers the ability to migrate the default serializer from
179183
If you would like to ignore this change in existing applications, set the following: `config.active_support.default_message_verifier_serializer = :marshal`.
180184

181185
In order to roll out the new default when upgrading from `7.0` to `7.1`, there are three configuration variables to keep in mind.
182-
```
186+
187+
```ruby
183188
config.active_support.default_verifier_serializer
184189
config.active_support.fallback_to_marshal_deserialization
185190
config.active_support.use_marshal_serialization
@@ -188,6 +193,7 @@ config.active_support.use_marshal_serialization
188193
`default_message_verifier_serializer` defaults to `:json` as of `7.1` but it offers both a `:hybrid` and `:marshal` option.
189194

190195
In order to migrate an older deployment to `:json`, first ensure that the `default_message_verifier_serializer` is set to `:marshal`.
196+
191197
```ruby
192198
# config/application.rb
193199
config.load_defaults 7.0
@@ -216,6 +222,7 @@ config.active_support.use_marshal_serialization = false
216222
Allow this configuration to run on all processes for a considerable amount of time.
217223
`ActiveSupport::JsonWithMarshalFallback` logs the following each time the `Marshal` fallback
218224
is used:
225+
219226
```
220227
JsonWithMarshalFallback: Marshal load fallback occurred.
221228
```
@@ -243,6 +250,7 @@ config.active_support.default_message_verifier_serializer = :json
243250
```
244251

245252
Alternatively, you could load defaults for 7.1
253+
246254
```ruby
247255
# config/application.rb
248256
config.load_defaults 7.1

0 commit comments

Comments
 (0)