diff options
author | GitLab Bot <gitlab-bot@gitlab.com> | 2019-10-02 15:06:04 +0300 |
---|---|---|
committer | GitLab Bot <gitlab-bot@gitlab.com> | 2019-10-02 15:06:04 +0300 |
commit | 81c6c53d6cd5ffde1c070d987dc2985f662cb301 (patch) | |
tree | 97ddbeb02373e8134edaa3e045f74d41d66cd500 /doc/update | |
parent | f7e0be9bbe1173b0de18a52a21b49d19349f40b7 (diff) |
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'doc/update')
-rw-r--r-- | doc/update/mysql_to_postgresql.md | 2 | ||||
-rw-r--r-- | doc/update/patch_versions.md | 4 | ||||
-rw-r--r-- | doc/update/upgrading_from_ce_to_ee.md | 4 | ||||
-rw-r--r-- | doc/update/upgrading_from_source.md | 4 |
4 files changed, 7 insertions, 7 deletions
diff --git a/doc/update/mysql_to_postgresql.md b/doc/update/mysql_to_postgresql.md index b202dd7e9d2..7f6162cca88 100644 --- a/doc/update/mysql_to_postgresql.md +++ b/doc/update/mysql_to_postgresql.md @@ -196,7 +196,7 @@ After the database is created, go on with the following steps: sudo -u git -H chmod o-rwx config/database.yml ``` -1. Install Gems related to Postgresql +1. Install Gems related to PostgreSQL ```bash sudo -u git -H rm .bundle/config diff --git a/doc/update/patch_versions.md b/doc/update/patch_versions.md index a555f1c82bf..73677b019eb 100644 --- a/doc/update/patch_versions.md +++ b/doc/update/patch_versions.md @@ -72,7 +72,7 @@ cd /home/git/gitlab sudo -u git -H bundle exec rake "gitlab:workhorse:install[/home/git/gitlab-workhorse]" RAILS_ENV=production ``` -### 5. Update gitaly to the corresponding version +### 5. Update Gitaly to the corresponding version ```bash cd /home/git/gitlab @@ -102,7 +102,7 @@ sudo -u git -H make ### 8. Install/Update `gitlab-elasticsearch-indexer` (optional) **(STARTER ONLY)** -If you're interested in using GitLab's new [elasticsearch repository indexer](../integration/elasticsearch.md#elasticsearch-repository-indexer-beta) (currently in beta) +If you're interested in using GitLab's new [Elasticsearch repository indexer](../integration/elasticsearch.md#elasticsearch-repository-indexer-beta) (currently in beta) please follow the instructions on the document linked above and enable the indexer usage in the GitLab admin settings. diff --git a/doc/update/upgrading_from_ce_to_ee.md b/doc/update/upgrading_from_ce_to_ee.md index ea9235c6d2a..b553b4aa405 100644 --- a/doc/update/upgrading_from_ce_to_ee.md +++ b/doc/update/upgrading_from_ce_to_ee.md @@ -74,8 +74,8 @@ sudo -u git -H bundle exec rake assets:clean assets:precompile cache:clear RAILS ### 4. Install `gitlab-elasticsearch-indexer` (optional) **(STARTER ONLY)** -If you're interested in using GitLab's new [elasticsearch repository -indexer](../integration/elasticsearch.md) (currently in beta) please follow the instructions on the +If you're interested in using GitLab's new [Elasticsearch repository indexer](../integration/elasticsearch.md) +(currently in beta) please follow the instructions on the document linked above and enable the indexer usage in the GitLab admin settings. ### 5. Start application diff --git a/doc/update/upgrading_from_source.md b/doc/update/upgrading_from_source.md index b1014ab5e03..d8c06f372b6 100644 --- a/doc/update/upgrading_from_source.md +++ b/doc/update/upgrading_from_source.md @@ -253,7 +253,7 @@ cd /home/git/gitlab git diff origin/PREVIOUS_BRANCH:config/gitlab.yml.example origin/BRANCH:config/gitlab.yml.example ``` -#### Nginx configuration +#### NGINX configuration Ensure you're still up-to-date with the latest NGINX configuration changes: @@ -268,7 +268,7 @@ git diff origin/PREVIOUS_BRANCH:lib/support/nginx/gitlab origin/BRANCH:lib/suppo ``` If you are using Strict-Transport-Security in your installation to continue -using it you must enable it in your Nginx configuration as GitLab application no +using it you must enable it in your NGINX configuration as GitLab application no longer handles setting it. If you are using Apache instead of NGINX please see the updated [Apache templates]. |