diff options
| author | GitLab Bot <gitlab-bot@gitlab.com> | 2023-10-04 15:17:55 +0300 |
|---|---|---|
| committer | GitLab Bot <gitlab-bot@gitlab.com> | 2023-10-04 15:17:55 +0300 |
| commit | 49d36ce6e3484aea8131dd892a02f8304ee61aa1 (patch) | |
| tree | ee7d8403c0ebacf5b5953ebbf1a838dd957eac6b /doc/integration | |
| parent | b68afda3299d372ef0b3745e0603a9d51369650b (diff) | |
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'doc/integration')
| -rw-r--r-- | doc/integration/advanced_search/elasticsearch.md | 2 | ||||
| -rw-r--r-- | doc/integration/mattermost/index.md | 1 |
2 files changed, 2 insertions, 1 deletions
diff --git a/doc/integration/advanced_search/elasticsearch.md b/doc/integration/advanced_search/elasticsearch.md index 333af9ce7ae..1afaa6b7d52 100644 --- a/doc/integration/advanced_search/elasticsearch.md +++ b/doc/integration/advanced_search/elasticsearch.md @@ -869,7 +869,7 @@ Make sure to prepare for this task by having a bundle exec rake gitlab:elastic:index_users RAILS_ENV=production ``` -1. Enable replication and refreshing again after indexing (only if you previously disabled it): +1. Enable replication and refreshing again after indexing (only if you previously increased the `refresh_interval`): ```shell curl --request PUT localhost:9200/gitlab-production/_settings --header 'Content-Type: application/json' \ diff --git a/doc/integration/mattermost/index.md b/doc/integration/mattermost/index.md index cf7178c7540..73f3140db2b 100644 --- a/doc/integration/mattermost/index.md +++ b/doc/integration/mattermost/index.md @@ -338,6 +338,7 @@ Below is a list of Mattermost version changes for GitLab 14.0 and later: | GitLab version | Mattermost version | Notes | | :------------- | :----------------- | ---------------------------------------------------------------------------------------- | +| 16.5 | 9.0 | | | 16.4 | 8.1 | | | 16.3 | 8.0 | | | 16.0 | 7.10 | | |