diff options
| author | Sean Griffin <sean@seantheprogrammer.com> | 2016-02-03 19:12:20 -0700 |
|---|---|---|
| committer | Sean Griffin <sean@seantheprogrammer.com> | 2016-02-03 19:12:20 -0700 |
| commit | 9df30839267c327ee4cad9808bfb7c694c20abac (patch) | |
| tree | c8e1b4fe5e1c293bf357d064ef3ed0b0839341be /railties | |
| parent | 8ee91d4051e679d6d6bbb6252796bbedde7d782c (diff) | |
| parent | c7f8019bff16554095ff5c2c4e539962922b7a55 (diff) | |
| download | rails-9df30839267c327ee4cad9808bfb7c694c20abac.tar.gz rails-9df30839267c327ee4cad9808bfb7c694c20abac.tar.bz2 rails-9df30839267c327ee4cad9808bfb7c694c20abac.zip | |
Merge pull request #23458 from kamipo/activerecord_supports_mysql_5.0_and_up
Active Record supports MySQL >= 5.0
Diffstat (limited to 'railties')
| -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 5ca549a8c8..f2c4922e7d 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 @@ -1,4 +1,4 @@ -# MySQL. Versions 4.1 and 5.0 are recommended. +# MySQL. Versions 5.0 and up are supported. # # Install the MySQL driver: # gem install activerecord-jdbcmysql-adapter 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 119c2fe2c3..193423e84a 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 @@ -1,4 +1,4 @@ -# MySQL. Versions 5.0+ are recommended. +# MySQL. Versions 5.0 and up are supported. # # Install the MySQL driver # gem install mysql2 |