Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
G
gitlab-ce
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
0
Merge Requests
0
Analytics
Analytics
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Commits
Issue Boards
Open sidebar
Tatuya Kamada
gitlab-ce
Commits
61fba0f4
Commit
61fba0f4
authored
Dec 28, 2015
by
Sytse Sijbrandij
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Thanks Robert for the corrections in the environment variables docs.
parent
fe2f1b44
Changes
2
Show whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
2 additions
and
2 deletions
+2
-2
config/database.yml.env
config/database.yml.env
+1
-1
doc/administration/enviroment_variables.md
doc/administration/enviroment_variables.md
+1
-1
No files found.
config/database.yml.env
View file @
61fba0f4
<%= ENV['RAILS_ENV'] %>:
<%= ENV['RAILS_ENV'] %>:
adapter: <%= ENV['GITLAB_DATABASE_ADAPTER'] || 'postgresql'
'
%>
adapter: <%= ENV['GITLAB_DATABASE_ADAPTER'] || 'postgresql' %>
encoding: <%= ENV['GITLAB_DATABASE_ENCODING'] || 'unicode' %>
encoding: <%= ENV['GITLAB_DATABASE_ENCODING'] || 'unicode' %>
database: <%= ENV['GITLAB_DATABASE_DATABASE'] || "gitlab_#{ENV['RAILS_ENV']}" %>
database: <%= ENV['GITLAB_DATABASE_DATABASE'] || "gitlab_#{ENV['RAILS_ENV']}" %>
pool: <%= ENV['GITLAB_DATABASE_POOL'] || '10' %>
pool: <%= ENV['GITLAB_DATABASE_POOL'] || '10' %>
...
...
doc/administration/enviroment_variables.md
View file @
61fba0f4
...
@@ -26,7 +26,7 @@ As explained in the [Heroku documentation](https://devcenter.heroku.com/articles
...
@@ -26,7 +26,7 @@ As explained in the [Heroku documentation](https://devcenter.heroku.com/articles
-
host
-
host
-
port
-
port
To do s
et these please
`cp config/database.yml.rb
config/database.yml`
and use the following variables:
To do s
o please
`cp config/database.yml.env
config/database.yml`
and use the following variables:
Variable | Default
Variable | Default
--- | ---
--- | ---
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment