summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSytse Sijbrandij <sytse@gitlab.com>2015-12-28 09:37:59 +0100
committerSytse Sijbrandij <sytse@gitlab.com>2015-12-28 09:37:59 +0100
commit61fba0f4cca1348978efd510ebb57ad55d991fdd (patch)
tree974fbc986a028af32674b8fd6a49322805343c5f
parentfe2f1b44813116ed1e1cafef293460ae8a4cf11a (diff)
downloadgitlab-ce-61fba0f4cca1348978efd510ebb57ad55d991fdd.tar.gz
Thanks Robert for the corrections in the environment variables docs.environment-variables-in-the-app
-rw-r--r--config/database.yml.env2
-rw-r--r--doc/administration/enviroment_variables.md2
2 files changed, 2 insertions, 2 deletions
diff --git a/config/database.yml.env b/config/database.yml.env
index 4fdc8eee7f5..b2ff23cb5ab 100644
--- a/config/database.yml.env
+++ b/config/database.yml.env
@@ -1,5 +1,5 @@
<%= ENV['RAILS_ENV'] %>:
- adapter: <%= ENV['GITLAB_DATABASE_ADAPTER'] || 'postgresql'' %>
+ adapter: <%= ENV['GITLAB_DATABASE_ADAPTER'] || 'postgresql' %>
encoding: <%= ENV['GITLAB_DATABASE_ENCODING'] || 'unicode' %>
database: <%= ENV['GITLAB_DATABASE_DATABASE'] || "gitlab_#{ENV['RAILS_ENV']}" %>
pool: <%= ENV['GITLAB_DATABASE_POOL'] || '10' %>
diff --git a/doc/administration/enviroment_variables.md b/doc/administration/enviroment_variables.md
index 8c9e2fd03ad..d7f5cb7c21f 100644
--- a/doc/administration/enviroment_variables.md
+++ b/doc/administration/enviroment_variables.md
@@ -26,7 +26,7 @@ As explained in the [Heroku documentation](https://devcenter.heroku.com/articles
- host
- port
-To do set these please `cp config/database.yml.rb config/database.yml` and use the following variables:
+To do so please `cp config/database.yml.env config/database.yml` and use the following variables:
Variable | Default
--- | ---