aboutsummaryrefslogtreecommitdiffstats
path: root/railties/lib
diff options
context:
space:
mode:
authorGuillermo Iguaran <guilleiguaran@gmail.com>2017-06-09 09:31:35 -0500
committerGitHub <noreply@github.com>2017-06-09 09:31:35 -0500
commitee840ac9037678f128b141bc85ed2d6b7916eb1d (patch)
tree4d45ed9171bdccd07f202f1bdf438d08e016c6b4 /railties/lib
parentf993a34f630b2c7382bd8e1d89c9d1b233930b08 (diff)
parenta53e2c186a58555b6f8ad34f000e24e56e7374a8 (diff)
downloadrails-ee840ac9037678f128b141bc85ed2d6b7916eb1d.tar.gz
rails-ee840ac9037678f128b141bc85ed2d6b7916eb1d.tar.bz2
rails-ee840ac9037678f128b141bc85ed2d6b7916eb1d.zip
Merge pull request #29361 from metaskills/sqlserversetup-take2
Ensure MSSQL password uses real ENV var.
Diffstat (limited to 'railties/lib')
-rw-r--r--railties/lib/rails/generators/rails/app/templates/config/databases/sqlserver.yml4
1 files changed, 2 insertions, 2 deletions
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 a21555e573..049de65f22 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,4 +1,4 @@
-# SQL Server (2012 or higher recommended)
+# SQL Server (2012 or higher required)
#
# Install the adapters and driver
# gem install tiny_tds
@@ -12,7 +12,7 @@ default: &default
adapter: sqlserver
encoding: utf8
username: sa
- password: <%= ENV['SA_PASSWORD'] %>
+ password: <%%= ENV['SA_PASSWORD'] %>
host: localhost
development: