From b105e3dcbd5ba4ab5da28dfc68916f543e55da2f Mon Sep 17 00:00:00 2001 From: Achilleas Pipinellis Date: Tue, 8 Nov 2016 22:09:38 +0100 Subject: Bring back the old JIRA docs https://gitlab.zendesk.com/agent/tickets/48003 [ci skip] --- doc/integration/README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'doc/integration/README.md') diff --git a/doc/integration/README.md b/doc/integration/README.md index a928b74f9b8..c2fd299db07 100644 --- a/doc/integration/README.md +++ b/doc/integration/README.md @@ -5,7 +5,7 @@ trackers and external authentication. See the documentation below for details on how to configure these services. -- [JIRA](jira.md) Integrate with the JIRA issue tracker +- [Jira](../project_services/jira.md) Integrate with the JIRA issue tracker - [External issue tracker](external-issue-tracker.md) Redmine, JIRA, etc. - [LDAP](ldap.md) Set up sign in via LDAP - [OmniAuth](omniauth.md) Sign in via Twitter, GitHub, GitLab.com, Google, Bitbucket, Facebook, Shibboleth, SAML, Crowd and Azure -- cgit v1.2.1 From e86ef2fd03500eaae2abd86164c9a91d9cc79921 Mon Sep 17 00:00:00 2001 From: Ben Bodenmiller Date: Sat, 12 Nov 2016 00:54:24 +0000 Subject: fix Super User spacing --- doc/integration/README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'doc/integration/README.md') diff --git a/doc/integration/README.md b/doc/integration/README.md index c2fd299db07..77bea3d2ceb 100644 --- a/doc/integration/README.md +++ b/doc/integration/README.md @@ -44,7 +44,7 @@ This [resource](http://kb.kerio.com/product/kerio-connect/server-configuration/s has all the information you need to add a certificate to the main trusted chain. This [answer](http://superuser.com/questions/437330/how-do-you-add-a-certificate-authority-ca-to-ubuntu) -at SuperUser also has relevant information. +at Super User also has relevant information. **Omnibus Trusted Chain** -- cgit v1.2.1 From b105d9da75d9e5131f2c118bc87f67df108d1214 Mon Sep 17 00:00:00 2001 From: Ben Bodenmiller Date: Mon, 14 Nov 2016 23:44:37 -0800 Subject: clarify best way to install custom CA --- doc/integration/README.md | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) (limited to 'doc/integration/README.md') diff --git a/doc/integration/README.md b/doc/integration/README.md index c2fd299db07..e3f6d48904d 100644 --- a/doc/integration/README.md +++ b/doc/integration/README.md @@ -48,7 +48,11 @@ at SuperUser also has relevant information. **Omnibus Trusted Chain** -It is enough to concatenate the certificate to the main trusted certificate: +[Install the self signed certificate or custom certificate authorities](http://docs.gitlab.com/omnibus/common_installation_problems/README.html#using-self-signed-certificate-or-custom-certificate-authorities) +in to GitLab Omnibus. + +It is enough to concatenate the certificate to the main trusted certificate +however it may be overwritten during upgrades: ```bash cat jira.pem >> /opt/gitlab/embedded/ssl/certs/cacert.pem -- cgit v1.2.1 From 264eda9f744f82173da4aac756643ac498b5b6a3 Mon Sep 17 00:00:00 2001 From: Achilleas Pipinellis Date: Thu, 17 Nov 2016 13:42:41 +0000 Subject: Revert "Merge branch 'docs/jira-old' into 'master'" This reverts merge request !7365 --- doc/integration/README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'doc/integration/README.md') diff --git a/doc/integration/README.md b/doc/integration/README.md index ae4387e2577..417dc874516 100644 --- a/doc/integration/README.md +++ b/doc/integration/README.md @@ -5,7 +5,7 @@ trackers and external authentication. See the documentation below for details on how to configure these services. -- [Jira](../project_services/jira.md) Integrate with the JIRA issue tracker +- [JIRA](jira.md) Integrate with the JIRA issue tracker - [External issue tracker](external-issue-tracker.md) Redmine, JIRA, etc. - [LDAP](ldap.md) Set up sign in via LDAP - [OmniAuth](omniauth.md) Sign in via Twitter, GitHub, GitLab.com, Google, Bitbucket, Facebook, Shibboleth, SAML, Crowd and Azure -- cgit v1.2.1 From a478a1dde4e02fcddc41d4e799fed70031162cd0 Mon Sep 17 00:00:00 2001 From: Achilleas Pipinellis Date: Tue, 22 Nov 2016 13:05:58 +0100 Subject: Move JIRA service doc back to its old location --- doc/integration/README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'doc/integration/README.md') diff --git a/doc/integration/README.md b/doc/integration/README.md index 417dc874516..f8ffa6dcb7f 100644 --- a/doc/integration/README.md +++ b/doc/integration/README.md @@ -5,7 +5,7 @@ trackers and external authentication. See the documentation below for details on how to configure these services. -- [JIRA](jira.md) Integrate with the JIRA issue tracker +- [JIRA](../project_services/jira.md) Integrate with the JIRA issue tracker - [External issue tracker](external-issue-tracker.md) Redmine, JIRA, etc. - [LDAP](ldap.md) Set up sign in via LDAP - [OmniAuth](omniauth.md) Sign in via Twitter, GitHub, GitLab.com, Google, Bitbucket, Facebook, Shibboleth, SAML, Crowd and Azure -- cgit v1.2.1