Merge branch 'master' into chinese-query

mattermost · Jul 24, 2023 · 600d4ee · 600d4ee
2 parents 5e19d4b + 8f71545
commit 600d4ee
Show file tree

Hide file tree

Showing 5 changed files with 22 additions and 9 deletions.
diff --git a/source/about/editions-and-offerings.rst b/source/about/editions-and-offerings.rst
@@ -45,8 +45,8 @@ For customers using our service in a self-hosted deployment, the Mattermost Free
 
 The Mattermost Professional and Mattermost Enterprise editions are only available after deploying our Mattermost Enterprise Edition code base, and then applying a valid license key that comes with a subscription purchase, or by starting a 30-day free trial that can be activated either in-product (**System Console > Edition and License > Start trial**) or online at https://mattermost.com/trial/.
 
-Mattermost Free
----------------
+Mattermost Free (Self-Hosted only)
+---------------------------------------------
 
 Mattermost Free is a set of collaboration features for accelerating your technical team’s productivity, shipping software faster with higher quality, and improving alignment among team members.
 

diff --git a/source/channels/organize-conversations.rst b/source/channels/organize-conversations.rst
@@ -101,4 +101,3 @@ In particular, please be aware of these important known issues and risks:
   - You may experience lag in your desktop or web client if you're following many threads or opening threads with many replies.
   - Server performance for instances with many users and posts may be impacted. 
   - You should expect to see more unread channels and notifications on your mobile device than you'll see on your desktop instance of Mattermost. This is expected when running a mobile app release older than v1.46.
-  - For a comprehensive list of known issues, and to see our work queue in priority order, check out our `Kanban board <https://mattermost.atlassian.net/secure/RapidBoard.jspa?rapidView=91&quickFilter=499>`__.
diff --git a/source/install/cloud-changelog.md b/source/install/cloud-changelog.md
@@ -4,12 +4,22 @@ This changelog summarizes updates to [Mattermost Cloud](https://mattermost.com/g
 
 Latest Mattermost Cloud releases:
 
+- [Release 2023-07-20](#release-2023-07-20)
+- [Release 2023-07-19](#release-2023-07-19)
 - [Release 2023-07-11](#release-2023-07-11)
 - [Release 2023-06-26](#release-2023-06-26)
 - [Release 2023-06-13](#release-2023-06-13)
 - [Release 2023-05-31](#release-2023-05-31)
-- [Release 2023-05-01](#release-2023-05-01)
-- [Release 2023-04-21](#release-2023-04-21)
+
+## Release 2023-07-20
+
+### Bug Fixes
+ - Added support for a new Cloud Export storage and a presigned URL generation.
+
+## Release 2023-07-19
+
+### Bug Fixes
+ - Fixed an issue where a "Seeker can't seek" error was displayed when viewing older image attachments.
 
 ## Release 2023-07-11
 

diff --git a/source/install/self-managed-changelog.md b/source/install/self-managed-changelog.md
@@ -14,7 +14,11 @@ Latest Mattermost Releases:
 
 ## Release v8.0 - [Major Release](https://docs.mattermost.com/upgrade/release-definitions.html#major-release)
 
-**Release Day: July 14, 2023**
+- **v8.0.1, release date TBD**
+  - Fixing an issue where the v8.0.0 **About Mattermost** dialog reports an incorrect server version in the Free Plan [MM-53681](https://mattermost.atlassian.net/browse/MM-53681).
+  - Adding support for embedding Mattermost in a Microsoft Teams iframe.
+- **8.0.0, released 2023-07-14**
+  - Original 8.0.0 release
 
 ### Important Upgrade Notes
 

diff --git a/source/onboard/sso-gitlab.rst b/source/onboard/sso-gitlab.rst
@@ -15,7 +15,7 @@ Follow these steps to configure Mattermost to use GitLab as a Single Sign-on (SS
   - Mattermost's open source Team Edition supports the OAuth 2.0 standard.
   - Mattermost Professional and Enterprise support the OpenID Connect standard.
 
-Step 1: Add an OpenID Connect application to your GitLab account
+Step 1: Add a Mattermost application to your GitLab account
 ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 
 1. Log in to your GitLab account, then go to ``https://{gitlab-site-name}/profile/applications``. For *{gitlab-site-name}* use the name of your GitLab instance. If you're using GitLab itself as your service provider, use ``gitlab.com``.
@@ -46,11 +46,11 @@ Step 2: Configure Mattermost for GitLab SSO
 
 1. Log in to Mattermost, then go to **System Console > Authentication > OpenID Connect**.
 2. Select **GitLab** as the service provider.
-3. Enter the **Gitlab Site URL** of your GitLab instance. If your GitLab instance is not set up to use SSL, start the URL with ``http://`` instead of ``https://``. If you are using GitLab itself as your provider, use ``gitlab.com``.
+3. Enter the **GitLab Site URL** of your GitLab instance. If your GitLab instance is not set up to use SSL, start the URL with ``http://`` instead of ``https://``. If you are using GitLab itself as your provider, use ``gitlab.com``.
 4. The **Discovery Endpoint** for OpenID Connect with GitLab is prepopulated with ``https://gitlab.com/.well-known/openid-configuration``.
 5. Paste the **Application ID** from GitLab as the **Client ID** in Mattermost.
 6. Paste the **Application Secret Key** from GitLab as the **Client Secret** in Mattermost. 
-7. Update the ``config.json`` file and specify the scopes you selected in GitLab under the ``GitLabSettings`` property. At a minimum, ``openid`` is a required scope for Mattermost Professional and Enterprise, and `read_user` is a required scope for Mattermost Team Edition. Changes to this setting require a server restart before taking effect. 
+7. Update the ``config.json`` file and specify the scopes you selected in GitLab under the ``GitLabSettings`` property. At a minimum, ``openid`` is a required scope for Mattermost Professional and Enterprise, and ``read_user`` is a required scope for Mattermost Team Edition. Mattermost Team Edition does not work with scopes other than ``read_user``. Changes to this setting require a server restart before taking effect. 
 8. Select **Save**.
 
 .. note::