summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>2019-05-13 10:26:47 +0300
committerDmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>2019-05-13 10:26:47 +0300
commitae123b497a2ca4d4dbd18da9d381e69934019675 (patch)
tree68e4974e4085219354ede324f432b22bc45d58f8
parentfe83b461d254683739ec2c792695376779887dec (diff)
downloadgitlab-ce-docs/improve-installation-from-source.tar.gz
Minor improvements for installation docdocs/improve-installation-from-source
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
-rw-r--r--doc/install/installation.md13
1 files changed, 6 insertions, 7 deletions
diff --git a/doc/install/installation.md b/doc/install/installation.md
index 5836f657da1..9a3b8178e9c 100644
--- a/doc/install/installation.md
+++ b/doc/install/installation.md
@@ -449,9 +449,8 @@ sudo -u git cp config/database.yml.postgresql config/database.yml
sudo -u git cp config/database.yml.mysql config/database.yml
# PostgreSQL only:
-# Remove host, username and password lines from config/database.yml.
-# You only need to adapt the production settings (first part).
-# The end config section will look like this:
+# Remove host, username, and password lines from config/database.yml.
+# Once modified, the `production` settings will be as follows:
#
# production:
# adapter: postgresql
@@ -580,9 +579,9 @@ For more information about configuring Gitaly see
### Start Gitaly
-We need gitaly up and running for the next section.
+Gitaly must be running for the next section.
-```
+```sh
gitlab_path=/home/git/gitlab
gitaly_path=/home/git/gitaly
@@ -663,9 +662,9 @@ sudo -u git -H bundle exec rake gettext:compile RAILS_ENV=production
```sh
sudo -u git -H yarn install --production --pure-lockfile
sudo -u git -H bundle exec rake gitlab:assets:compile RAILS_ENV=production NODE_ENV=production
+```
-If the last command failed with "JavaScript heap out of memory" error, then
-try to run it with NODE_OPTIONS. Otherwise skip the command line below.
+If `rake` fails with `JavaScript heap out of memory` error, try to run it with `NODE_OPTIONS` set as follows.
```sh
sudo -u git -H bundle exec rake gitlab:assets:compile RAILS_ENV=production NODE_ENV=production NODE_OPTIONS="--max_old_space_size=4096"