Commit 7a8194bc authored by Achilleas Pipinellis's avatar Achilleas Pipinellis

Merge branch 'docs/add-jira-sso-captcha-notes' into 'master'

Add SSO and CAPTCHA notes to JIRA docs

See merge request gitlab-org/gitlab-ee!4332
parents bdbb6942 9ffa9552
...@@ -54,6 +54,11 @@ We have split this stage in steps so it is easier to follow. ...@@ -54,6 +54,11 @@ We have split this stage in steps so it is easier to follow.
--- ---
NOTE: **Note:**
Our integration does not support SSO (such as SAML). You will need to create
an HTTP basic authentication password. You can do this by heading to the user
profile, looking up the username, and setting a password.
1. Now, let's create a `gitlab-developers` group which will have write access 1. Now, let's create a `gitlab-developers` group which will have write access
to projects in JIRA. Go to the **Groups** tab and select **Create group**. to projects in JIRA. Go to the **Groups** tab and select **Create group**.
...@@ -166,7 +171,7 @@ the same goal: ...@@ -166,7 +171,7 @@ the same goal:
where `PROJECT-1` is the issue ID of the JIRA project. where `PROJECT-1` is the issue ID of the JIRA project.
>**Note:** >**Notes:**
- Only commits and merges into the project's default branch (usually **master**) will - Only commits and merges into the project's default branch (usually **master**) will
close an issue in Jira. You can change your projects default branch under close an issue in Jira. You can change your projects default branch under
[project settings](img/jira_project_settings.png). [project settings](img/jira_project_settings.png).
...@@ -224,6 +229,14 @@ Make sure that the JIRA issue is not already marked as resolved, in other words ...@@ -224,6 +229,14 @@ Make sure that the JIRA issue is not already marked as resolved, in other words
the JIRA issue resolution field is not set. (It should not be struck through in the JIRA issue resolution field is not set. (It should not be struck through in
JIRA lists.) JIRA lists.)
### CAPTCHA
CAPTCHA may be triggered after several consecutive failed log in attempts
which may lead to a `401 unauthorized` error when testing your JIRA integration.
If CAPTCHA has been triggered, you will not be able to use JIRA’s REST API to
authenticate with the JIRA site. You will need to log in to your JIRA instance
and complete the CAPTCHA.
[services-templates]: services_templates.md [services-templates]: services_templates.md
[jira-repo-old-docs]: https://gitlab.com/gitlab-org/gitlab-ce/blob/8-13-stable/doc/project_services/jira.md [jira-repo-old-docs]: https://gitlab.com/gitlab-org/gitlab-ce/blob/8-13-stable/doc/project_services/jira.md
[jira]: https://www.atlassian.com/software/jira [jira]: https://www.atlassian.com/software/jira
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment