diff options
Diffstat (limited to 'doc')
-rw-r--r-- | doc/help/Messaging.md | 2 | ||||
-rw-r--r-- | doc/install/Administration.md | 6 |
2 files changed, 7 insertions, 1 deletions
diff --git a/doc/help/Messaging.md b/doc/help/Messaging.md index 03adc1ce8..09d35f3b9 100644 --- a/doc/help/Messaging.md +++ b/doc/help/Messaging.md @@ -4,7 +4,7 @@ You can write messages using the input box with the text "Write a message..." at the bottom of Mattermost. -Press **ENTER** to send a message. Use **Ctrl+ENTER** to create a new line without sending a message. +Press **ENTER** to send a message. Use **Shift+ENTER** to create a new line without sending a message. ## Formatting Messages diff --git a/doc/install/Administration.md b/doc/install/Administration.md index 15bd07778..d5e949fa0 100644 --- a/doc/install/Administration.md +++ b/doc/install/Administration.md @@ -94,6 +94,12 @@ To upgrade GitLab Mattermost from the 0.7.1-beta release of Mattermost in GitLab 1. Check that your SSL settings for the SSO provider match the `http://` or `https://` choice selected in `config.json` under `GitLabSettings` 2. Follow steps 1 to 3 of the manual [GitLab SSO configuration procedure](https://github.com/mattermost/platform/blob/master/doc/integrations/Single-Sign-On/Gitlab.md) to confirm your `Secret` and `Id` settings in `config.json` match your GitLab settings, and if they don't, manually update `config.json` to the correct settings and see if this clears the issue. +###### `"The redirect URI included is not valid.` + - This error may be related to SSL configurations in your proxy after a GitLab omnibus upgrade from 8.0, which contained the Mattermost beta version. + - **Solution:** + - Please check that each step of [the procedure for upgrading Mattermost in GitLab 8.0 to GitLab 8.1 was completed](https://github.com/mattermost/platform/blob/master/doc/install/Upgrade-Guide.md#upgrading-mattermost-in-gitlab-80-to-gitlab-81-with-omnibus). Then check upgrades to successive major versions were completed using the procedure in the [Upgrade Guide](https://github.com/mattermost/platform/blob/master/doc/install/Upgrade-Guide.md#upgrading-mattermost-to-next-major-release). + + ###### `We couldn't find the existing account` - This error appears when a user attempts to sign in using a single-sign-on option with an account that was not created using that single-sign-on option. For example, if a user creates Account A using email sign-up, then attempts to sign-in using GitLab SSO, the error appears since Account A was not created using GitLab SSO. - **Solution:** |