diff options
| author | GitLab Bot <gitlab-bot@gitlab.com> | 2019-12-20 12:24:38 +0300 |
|---|---|---|
| committer | GitLab Bot <gitlab-bot@gitlab.com> | 2019-12-20 12:24:38 +0300 |
| commit | 898e2cc1dfa88b4ac39cb4b35011f61b37f57b51 (patch) | |
| tree | c6524edb6c9a43cccf93be05c36883fde1a53ee4 /doc/update | |
| parent | b5571e6e22cdacc81f78eff5943d68c8ba220fbb (diff) | |
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'doc/update')
| -rw-r--r-- | doc/update/patch_versions.md | 6 | ||||
| -rw-r--r-- | doc/update/upgrading_from_ce_to_ee.md | 6 |
2 files changed, 4 insertions, 8 deletions
diff --git a/doc/update/patch_versions.md b/doc/update/patch_versions.md index b00fc5d90cf..5aa97d82fd1 100644 --- a/doc/update/patch_versions.md +++ b/doc/update/patch_versions.md @@ -94,11 +94,9 @@ sudo -u git -H git checkout v$(</home/git/gitlab/GITLAB_PAGES_VERSION) sudo -u git -H make ``` -### 8. Install/Update `gitlab-elasticsearch-indexer` (optional) **(STARTER ONLY)** +### 8. Install/Update `gitlab-elasticsearch-indexer` **(STARTER ONLY)** -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. +Please follow the [install instruction](../integration/elasticsearch.md#installation). ### 9. Start application diff --git a/doc/update/upgrading_from_ce_to_ee.md b/doc/update/upgrading_from_ce_to_ee.md index 52a65a89cbf..d1853466e30 100644 --- a/doc/update/upgrading_from_ce_to_ee.md +++ b/doc/update/upgrading_from_ce_to_ee.md @@ -77,11 +77,9 @@ sudo -u git -H bundle exec rake yarn:install gitlab:assets:clean gitlab:assets:c sudo -u git -H bundle exec rake cache:clear RAILS_ENV=production ``` -### 4. Install `gitlab-elasticsearch-indexer` (optional) **(STARTER ONLY)** +### 4. Install `gitlab-elasticsearch-indexer` **(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 -document linked above and enable the indexer usage in the GitLab admin settings. +Please follow the [install instruction](../integration/elasticsearch.md#installation). ### 5. Start application |