diff options
| author | Ryuta Kamizono <kamipo@gmail.com> | 2017-08-22 00:53:57 +0900 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-08-22 00:53:57 +0900 |
| commit | c20b40c532ef5ec4f2dea647832ff8ffd3603816 (patch) | |
| tree | f0ae4009323093747d6d54c8f725802916a4e525 | |
| parent | 3580edc9faf5cc0a0e467911d0a4dc4faf153709 (diff) | |
| parent | bd7b61aefb4382f3cf2113c883f12bc5a3e99ae5 (diff) | |
| download | rails-c20b40c532ef5ec4f2dea647832ff8ffd3603816.tar.gz rails-c20b40c532ef5ec4f2dea647832ff8ffd3603816.tar.bz2 rails-c20b40c532ef5ec4f2dea647832ff8ffd3603816.zip | |
Merge pull request #30346 from yhirano55/fix_broken_link_to_mysql_docs_in_database_yml
Fix broken link to mysql docs in database.yml [ci skip]
| -rw-r--r-- | railties/lib/rails/generators/rails/app/templates/config/databases/jdbcmysql.yml | 2 | ||||
| -rw-r--r-- | railties/lib/rails/generators/rails/app/templates/config/databases/mysql.yml | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/railties/lib/rails/generators/rails/app/templates/config/databases/jdbcmysql.yml b/railties/lib/rails/generators/rails/app/templates/config/databases/jdbcmysql.yml index 8bc8735a8e..2a67bdca25 100644 --- a/railties/lib/rails/generators/rails/app/templates/config/databases/jdbcmysql.yml +++ b/railties/lib/rails/generators/rails/app/templates/config/databases/jdbcmysql.yml @@ -7,7 +7,7 @@ # gem 'activerecord-jdbcmysql-adapter' # # And be sure to use new-style password hashing: -# http://dev.mysql.com/doc/refman/5.7/en/old-client.html +# https://dev.mysql.com/doc/refman/5.7/en/password-hashing.html # default: &default adapter: mysql diff --git a/railties/lib/rails/generators/rails/app/templates/config/databases/mysql.yml b/railties/lib/rails/generators/rails/app/templates/config/databases/mysql.yml index 269af1470d..04afaa0596 100644 --- a/railties/lib/rails/generators/rails/app/templates/config/databases/mysql.yml +++ b/railties/lib/rails/generators/rails/app/templates/config/databases/mysql.yml @@ -7,7 +7,7 @@ # gem 'mysql2' # # And be sure to use new-style password hashing: -# http://dev.mysql.com/doc/refman/5.7/en/old-client.html +# https://dev.mysql.com/doc/refman/5.7/en/password-hashing.html # default: &default adapter: mysql2 |