summaryrefslogtreecommitdiff
path: root/doc/user/project/integrations
diff options
context:
space:
mode:
authorClement Ho <ClemMakesApps@gmail.com>2017-12-21 17:20:43 -0600
committerClement Ho <ClemMakesApps@gmail.com>2017-12-21 17:20:43 -0600
commitaa1874fbf8795677e53797205cb65b6f4fb83d4c (patch)
tree85a5cfb6bdac803258df8e2df09a50169468996a /doc/user/project/integrations
parent3895d54c6bfbd37ac65624496c0fd7b4973944e7 (diff)
parent82e31ee46784cc4a0b987511ce7506dd01a3f004 (diff)
downloadgitlab-ce-move-gl-dropdown.tar.gz
Merge branch 'master' into move-gl-dropdownmove-gl-dropdown
Diffstat (limited to 'doc/user/project/integrations')
-rw-r--r--doc/user/project/integrations/jira.md3
1 files changed, 3 insertions, 0 deletions
diff --git a/doc/user/project/integrations/jira.md b/doc/user/project/integrations/jira.md
index 93aec56f8dc..7dc234a9759 100644
--- a/doc/user/project/integrations/jira.md
+++ b/doc/user/project/integrations/jira.md
@@ -98,6 +98,9 @@ password as they will be needed when configuring GitLab in the next section.
- GitLab 8.14 introduced a new way to integrate with JIRA which greatly simplified
the configuration options you have to enter. If you are using an older version,
[follow this documentation][jira-repo-old-docs].
+- In order to support Oracle's Access Manager, GitLab will send additional cookies
+ to enable Basic Auth. The cookie being added to each request is `OBBasicAuth` with
+ a value of `fromDialog`.
To enable JIRA integration in a project, navigate to the
[Integrations page](project_services.md#accessing-the-project-services), click