diff options
| author | Ryuta Kamizono <kamipo@gmail.com> | 2019-04-02 03:26:31 +0900 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-04-02 03:26:31 +0900 |
| commit | e4e12185837c1aa9233e4669d0a54b54173e1bf1 (patch) | |
| tree | 8a63972a1b3317906a04dccbe76146716c5a4a0e /activerecord | |
| parent | a835fba44f23637aa8d043a46cbc3799f644bea1 (diff) | |
| parent | 771973c13dd5b68fe96fbe5ea96bd11656437dc1 (diff) | |
| download | rails-e4e12185837c1aa9233e4669d0a54b54173e1bf1.tar.gz rails-e4e12185837c1aa9233e4669d0a54b54173e1bf1.tar.bz2 rails-e4e12185837c1aa9233e4669d0a54b54173e1bf1.zip | |
Merge pull request #35820 from sharang-d/url-to-URL-except-actionpack
url -> URL where apt except inside actionpack/
Diffstat (limited to 'activerecord')
| -rw-r--r-- | activerecord/CHANGELOG.md | 4 | ||||
| -rw-r--r-- | activerecord/lib/active_record/database_configurations.rb | 2 |
2 files changed, 3 insertions, 3 deletions
diff --git a/activerecord/CHANGELOG.md b/activerecord/CHANGELOG.md index 37f31462b3..d73d9ade41 100644 --- a/activerecord/CHANGELOG.md +++ b/activerecord/CHANGELOG.md @@ -5,7 +5,7 @@ *Ryan H. Kerr* -* Add `ActiveRecord::Relation#extract_associated` for extracting associated records from a relation. +* Add `ActiveRecord::Relation#extract_associated` for extracting associated records from a relation. ``` account.memberships.extract_associated(:user) @@ -454,7 +454,7 @@ *Sean Griffin* -* Add support for hash and url configs in database hash of `ActiveRecord::Base.connected_to`. +* Add support for hash and URL configs in database hash of `ActiveRecord::Base.connected_to`. ```` User.connected_to(database: { writing: "postgres://foo" }) do diff --git a/activerecord/lib/active_record/database_configurations.rb b/activerecord/lib/active_record/database_configurations.rb index 7431a1c759..44b5cfc738 100644 --- a/activerecord/lib/active_record/database_configurations.rb +++ b/activerecord/lib/active_record/database_configurations.rb @@ -7,7 +7,7 @@ require "active_record/database_configurations/url_config" module ActiveRecord # ActiveRecord::DatabaseConfigurations returns an array of DatabaseConfig # objects (either a HashConfig or UrlConfig) that are constructed from the - # application's database configuration hash or url string. + # application's database configuration hash or URL string. class DatabaseConfigurations attr_reader :configurations delegate :any?, to: :configurations |