diff options
| author | GitLab Bot <gitlab-bot@gitlab.com> | 2022-07-01 12:08:29 +0300 |
|---|---|---|
| committer | GitLab Bot <gitlab-bot@gitlab.com> | 2022-07-01 12:08:29 +0300 |
| commit | 4def415fbf45e0693b17ea418d378d62ab03a146 (patch) | |
| tree | 48fa3f684b33eefbd37e57b7bbe1a17926825e6a /doc | |
| parent | a6dce21d917a0a359b3521ec3cef02ab3e6199cf (diff) | |
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'doc')
| -rw-r--r-- | doc/administration/geo/setup/index.md | 3 | ||||
| -rw-r--r-- | doc/ci/ci_cd_for_external_repos/bitbucket_integration.md | 7 | ||||
| -rw-r--r-- | doc/development/sidekiq/compatibility_across_updates.md | 5 |
3 files changed, 13 insertions, 2 deletions
diff --git a/doc/administration/geo/setup/index.md b/doc/administration/geo/setup/index.md index 4a3f0f41a83..f7d47d82e71 100644 --- a/doc/administration/geo/setup/index.md +++ b/doc/administration/geo/setup/index.md @@ -12,6 +12,9 @@ These instructions assume you have a working instance of GitLab. They guide you 1. Making your existing instance the **primary** site. 1. Adding **secondary** sites. +You must use a [GitLab Premium](https://about.gitlab.com/pricing/) license or higher, +but you only need one license for all the sites. + WARNING: The steps below should be followed in the order they appear. **Make sure the GitLab version is the same on all sites.** diff --git a/doc/ci/ci_cd_for_external_repos/bitbucket_integration.md b/doc/ci/ci_cd_for_external_repos/bitbucket_integration.md index 40b29ebb6ea..42babf00841 100644 --- a/doc/ci/ci_cd_for_external_repos/bitbucket_integration.md +++ b/doc/ci/ci_cd_for_external_repos/bitbucket_integration.md @@ -18,8 +18,13 @@ To use GitLab CI/CD with a Bitbucket Cloud repository: 1. On the top menu, select **Projects > Create new project**. 1. Select **Run CI/CD for external repository**. 1. Select **Repository by URL**. - + 1. Fill in the fields with information from the repository in Bitbucket: + - For **Git repository URL**, use the URL from the **Clone this repository** panel in Bitbucket. + - Leave the username blank. + - You can generate and use a [Bitbucket App Password](https://support.atlassian.com/bitbucket-cloud/docs/app-passwords/) for the password field. + GitLab imports the repository and enables [Pull Mirroring](../../user/project/repository/mirror/pull.md). + You can check that mirroring is working in the project by going to **Settings > Repository > Mirroring repositories**. 1. In GitLab, create a [Personal Access Token](../../user/profile/personal_access_tokens.md) diff --git a/doc/development/sidekiq/compatibility_across_updates.md b/doc/development/sidekiq/compatibility_across_updates.md index 35f4b88351e..96a3573d11a 100644 --- a/doc/development/sidekiq/compatibility_across_updates.md +++ b/doc/development/sidekiq/compatibility_across_updates.md @@ -142,7 +142,10 @@ When renaming queues, use the `sidekiq_queue_migrate` helper migration method in a **post-deployment migration**: ```ruby -class MigrateTheRenamedSidekiqQueue < Gitlab::Database::Migration[1.0] +class MigrateTheRenamedSidekiqQueue < Gitlab::Database::Migration[2.0] + restrict_gitlab_migration gitlab_schema: :gitlab_main + disable_ddl_transaction! + def up sidekiq_queue_migrate 'old_queue_name', to: 'new_queue_name' end |