summaryrefslogtreecommitdiffstats
path: root/doc
diff options
context:
space:
mode:
author=Corey Hulen <corey@hulen.com>2016-01-05 08:54:39 -0600
committer=Corey Hulen <corey@hulen.com>2016-01-05 08:54:39 -0600
commit456b7872a47aea135fbadf334e9ecf653712d48a (patch)
treeaf117933cbc60ff1da569aa70e24ceac034c9dd6 /doc
parenta35de266df1eb130572834ad31e3b8822284048c (diff)
downloadchat-456b7872a47aea135fbadf334e9ecf653712d48a.tar.gz
chat-456b7872a47aea135fbadf334e9ecf653712d48a.tar.bz2
chat-456b7872a47aea135fbadf334e9ecf653712d48a.zip
PLT-1572 Adding more info to the error message
Diffstat (limited to 'doc')
-rw-r--r--doc/install/Administration.md2
-rw-r--r--doc/install/Troubleshooting.md2
2 files changed, 2 insertions, 2 deletions
diff --git a/doc/install/Administration.md b/doc/install/Administration.md
index c51022da1..53f413d04 100644
--- a/doc/install/Administration.md
+++ b/doc/install/Administration.md
@@ -100,7 +100,7 @@ To upgrade GitLab Mattermost from the 0.7.1-beta release of Mattermost in GitLab
- 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`
+###### `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:**
- If you're switching from email auth to GitLab SSO, and you're getting this issue on an admin account, consider deactivating your email-based account, then creating a new account with System Admin privileges using GitLab SSO. Specifically:
diff --git a/doc/install/Troubleshooting.md b/doc/install/Troubleshooting.md
index deae7717d..05cac2f48 100644
--- a/doc/install/Troubleshooting.md
+++ b/doc/install/Troubleshooting.md
@@ -52,7 +52,7 @@ The following is a list of common error messages and solutions:
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.
-###### `We couldn't find the existing account`
+###### `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:**
- If you're switching from email auth to GitLab SSO, and you're getting this issue on an admin account, consider deactivating your email-based account, then creating a new account with System Admin privileges using GitLab SSO. Specifically: