diff options
| author | Carlos Antonio da Silva <carlosantoniodasilva@gmail.com> | 2013-01-04 07:39:23 -0800 |
|---|---|---|
| committer | Carlos Antonio da Silva <carlosantoniodasilva@gmail.com> | 2013-01-04 07:39:23 -0800 |
| commit | f6386f7ec9e7989108e1bf160b639c0befb66ef3 (patch) | |
| tree | ec371232a50c0047fddd0d79bf7a0772f901d351 /railties/lib | |
| parent | be26d51f9eec59cb3a4f181a2d7390e6f26cbfc6 (diff) | |
| parent | 2bacacd653a01a027488c8208a7f4f7da8224db2 (diff) | |
| download | rails-f6386f7ec9e7989108e1bf160b639c0befb66ef3.tar.gz rails-f6386f7ec9e7989108e1bf160b639c0befb66ef3.tar.bz2 rails-f6386f7ec9e7989108e1bf160b639c0befb66ef3.zip | |
Merge pull request #8747 from asanghi/wsfix
Remove dangling whitespace in generated database yml files for postgresql and sqlserver [ci skip]
Diffstat (limited to 'railties/lib')
| -rw-r--r-- | railties/lib/rails/generators/rails/app/templates/config/databases/postgresql.yml | 2 | ||||
| -rw-r--r-- | railties/lib/rails/generators/rails/app/templates/config/databases/sqlserver.yml | 6 |
2 files changed, 4 insertions, 4 deletions
diff --git a/railties/lib/rails/generators/rails/app/templates/config/databases/postgresql.yml b/railties/lib/rails/generators/rails/app/templates/config/databases/postgresql.yml index 22c9194fad..eb569b7dab 100644 --- a/railties/lib/rails/generators/rails/app/templates/config/databases/postgresql.yml +++ b/railties/lib/rails/generators/rails/app/templates/config/databases/postgresql.yml @@ -26,7 +26,7 @@ development: # domain socket that doesn't need configuration. Windows does not have # domain sockets, so uncomment these lines. #host: localhost - + # The TCP port the server listens on. Defaults to 5432. # If your server runs on a different port number, change accordingly. #port: 5432 diff --git a/railties/lib/rails/generators/rails/app/templates/config/databases/sqlserver.yml b/railties/lib/rails/generators/rails/app/templates/config/databases/sqlserver.yml index b52b733c56..53620dc8e2 100644 --- a/railties/lib/rails/generators/rails/app/templates/config/databases/sqlserver.yml +++ b/railties/lib/rails/generators/rails/app/templates/config/databases/sqlserver.yml @@ -1,5 +1,5 @@ # SQL Server (2005 or higher recommended) -# +# # Install the adapters and driver # gem install tiny_tds # gem install activerecord-sqlserver-adapter @@ -8,8 +8,8 @@ # gem 'tiny_tds' # gem 'activerecord-sqlserver-adapter' # -# You should make sure freetds is configured correctly first. -# freetds.conf contains host/port/protocol_versions settings. +# You should make sure freetds is configured correctly first. +# freetds.conf contains host/port/protocol_versions settings. # http://freetds.schemamania.org/userguide/freetdsconf.htm # # A typical Microsoft server |