Merge branch 'update_documentation_nginx_mattermost_#2143' into 'master'

Resolve #2143 - Clarify disabling nginx when only using mattermost

Closes #2143

See merge request https://gitlab.com/gitlab-org/omnibus-gitlab/-/merge_requests/7574

Merged-by: Andreas Hering <avalor_dds@web.de>
Reviewed-by: Evan Read <eread@gitlab.com>
Co-authored-by: Andreas Hering <andreas.hering@telekom.de>

config/software/registry.rb

@@ -19,7 +19,7 @@
 require "#{Omnibus::Config.project_root}/lib/gitlab/version"
 
 name 'registry'
-version = Gitlab::Version.new('registry', 'v3.93.0-gitlab')
+version = Gitlab::Version.new('registry', 'v4.0.0-gitlab')
 
 default_version version.print(false)
 display_version version.print(false).delete_suffix('-gitlab')

doc/settings/nginx.md

@@ -19,6 +19,9 @@ Users can configure NGINX settings differently for different services via
 available for `nginx` are also available for these `<service_nginx>` settings and
 share the same default values as GitLab NGINX.
 
+To disable NGINX but keep it running for other services like Mattermost, you should use `gitlab_rails['enable'] = false` instead of `nginx['enable'] = false`.
+For more information, see [Running GitLab Mattermost on its own server](https://docs.gitlab.com/ee/integration/mattermost/#running-gitlab-mattermost-on-its-own-server).
+
 If modifying via `gitlab.rb`, users have to configure NGINX setting for each
 service separately. Settings given via `nginx['foo']` WILL NOT be replicated to
 service specific NGINX configuration (as `registry_nginx['foo']` or
@@ -367,7 +370,7 @@ You should create custom server blocks in the `/etc/gitlab/nginx/sites-available
 1. Run the following command:
 
    ```shell
-   sudo ln -s /etc/gitlab/nginx/sites-available/example.conf /etc/gitlab/nginx/sites-enabled/example.conf 
+   sudo ln -s /etc/gitlab/nginx/sites-available/example.conf /etc/gitlab/nginx/sites-enabled/example.conf
    ```
 
 You can add domains for server blocks [as an alternative name](ssl/index.md#add-alternative-domains-to-the-certificate)