diff options
| author | GitLab Bot <gitlab-bot@gitlab.com> | 2021-04-27 00:10:25 +0300 |
|---|---|---|
| committer | GitLab Bot <gitlab-bot@gitlab.com> | 2021-04-27 00:10:25 +0300 |
| commit | 70cfa5e3e7e6765590a664165eac0ef00c3d05dc (patch) | |
| tree | 52216b5c0b72688f14dc5b481bc86a7eb9d0acb4 /doc/development/integrations | |
| parent | e7e40d45b066139707b3b851c6004e075da5226b (diff) | |
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'doc/development/integrations')
| -rw-r--r-- | doc/development/integrations/codesandbox.md | 2 | ||||
| -rw-r--r-- | doc/development/integrations/jira_connect.md | 4 |
2 files changed, 3 insertions, 3 deletions
diff --git a/doc/development/integrations/codesandbox.md b/doc/development/integrations/codesandbox.md index 62acdda6d0d..234f8c7fe0b 100644 --- a/doc/development/integrations/codesandbox.md +++ b/doc/development/integrations/codesandbox.md @@ -15,7 +15,7 @@ creating upstream contributions like [this one](https://github.com/codesandbox/c Before using CodeSandbox with your local GitLab instance, you must: 1. Enable HTTPS on your GDK. CodeSandbox uses Service Workers that require `https`. - Follow the GDK [NGINX configuration instructions](https://gitlab.com/gitlab-org/gitlab-development-kit/-/blob/master/doc/howto/nginx.md) to enable HTTPS for GDK. + Follow the GDK [NGINX configuration instructions](https://gitlab.com/gitlab-org/gitlab-development-kit/-/blob/main/doc/howto/nginx.md) to enable HTTPS for GDK. 1. Clone the [`codesandbox-client` project](https://github.com/codesandbox/codesandbox-client) locally. If you plan on contributing upstream, you might want to fork and clone first. 1. (Optional) Use correct `python` and `nodejs` versions. Otherwise, `yarn` may fail to diff --git a/doc/development/integrations/jira_connect.md b/doc/development/integrations/jira_connect.md index 860fd88612f..98a48007238 100644 --- a/doc/development/integrations/jira_connect.md +++ b/doc/development/integrations/jira_connect.md @@ -16,7 +16,7 @@ The following are required to install and test the app: - [GDK in Gitpod](https://www.loom.com/share/9c9711d4876a40869b9294eecb24c54d) video. - - [GDK with Gitpod](https://gitlab.com/gitlab-org/gitlab-development-kit/-/blob/master/doc/howto/gitpod.md) + - [GDK with Gitpod](https://gitlab.com/gitlab-org/gitlab-development-kit/-/blob/main/doc/howto/gitpod.md) documentation. You **must not** use tunneling tools such as @@ -61,7 +61,7 @@ To install the app in Jira: If the app install failed, you might need to delete `jira_connect_installations` from your database. -1. Open the [database console](https://gitlab.com/gitlab-org/gitlab-development-kit/-/blob/master/doc/howto/postgresql.md#access-postgresql). +1. Open the [database console](https://gitlab.com/gitlab-org/gitlab-development-kit/-/blob/main/doc/howto/postgresql.md#access-postgresql). 1. Run `TRUNCATE TABLE jira_connect_installations CASCADE;`. ## Add a namespace |