aboutsummaryrefslogtreecommitdiffstats
path: root/guides/source/configuring.md
diff options
context:
space:
mode:
Diffstat (limited to 'guides/source/configuring.md')
-rw-r--r--guides/source/configuring.md6
1 files changed, 4 insertions, 2 deletions
diff --git a/guides/source/configuring.md b/guides/source/configuring.md
index bcf045b6e0..1d3ff6e6e7 100644
--- a/guides/source/configuring.md
+++ b/guides/source/configuring.md
@@ -281,6 +281,8 @@ All these configuration options are delegated to the `I18n` library.
* `config.active_record.schema_format` controls the format for dumping the database schema to a file. The options are `:ruby` (the default) for a database-independent version that depends on migrations, or `:sql` for a set of (potentially database-dependent) SQL statements.
+* `config.active_record.error_on_ignored_order_or_limit` specifies if an error should be raised if the order or limit of a query is ignored during a batch query. The options are true (raise error) or false (warn). Default is false.
+
* `config.active_record.timestamped_migrations` controls whether migrations are numbered with serial integers or with timestamps. The default is true, to use timestamps, which are preferred if there are multiple developers working on the same application.
* `config.active_record.lock_optimistically` controls whether Active Record will use optimistic locking and is true by default.
@@ -622,8 +624,8 @@ There are a few configuration options available in Active Support:
if you are running Action Cable servers that are separated from your
main application.
* `config.action_cable.mount_path` accepts a string for where to mount Action
- Cable, as apart of the main server process. Defaults to `/cable`.
-You can set this as nil to not mount Action Cable as apart of your
+ Cable, as part of the main server process. Defaults to `/cable`.
+You can set this as nil to not mount Action Cable as part of your
normal Rails server.
### Configuring a Database