diff options
| author | GitLab Bot <gitlab-bot@gitlab.com> | 2023-05-25 09:08:37 +0300 |
|---|---|---|
| committer | GitLab Bot <gitlab-bot@gitlab.com> | 2023-05-25 09:08:37 +0300 |
| commit | 3146b64c517a37529e440f7724e147dbfdfbeb9c (patch) | |
| tree | f9e7a55e21e9f891d42b92882439e3c49ebe6082 | |
| parent | 89297ece0837b99456527dacda56e6b27aa48421 (diff) | |
Add latest changes from gitlab-org/gitlab@master
| -rw-r--r-- | doc/update/index.md | 2 | ||||
| -rw-r--r-- | doc/user/project/import/github.md | 2 | ||||
| -rw-r--r-- | qa/qa/specs/features/browser_ui/1_manage/login/register_spec.rb | 2 |
3 files changed, 4 insertions, 2 deletions
diff --git a/doc/update/index.md b/doc/update/index.md index 07baec8d072..5409dcb71f5 100644 --- a/doc/update/index.md +++ b/doc/update/index.md @@ -276,6 +276,8 @@ and [Helm Chart deployments](https://docs.gitlab.com/charts/). They come with ap ### 16.0.0 +- Sidekiq crashes if there are non-ASCII characters in the GitLab.rb file. You can fix this + by following the workaround in [issue 412767](https://gitlab.com/gitlab-org/gitlab/-/issues/412767#note_1404507549). - Sidekiq jobs are only routed to `default` and `mailers` queues by default, and as a result, every Sidekiq process also listens to those queues to ensure all jobs are processed across all queues. This behavior does not apply if you have configured the [routing rules](../administration/sidekiq/processing_specific_job_classes.md#routing-rules). diff --git a/doc/user/project/import/github.md b/doc/user/project/import/github.md index b7b728649a7..068663af0c9 100644 --- a/doc/user/project/import/github.md +++ b/doc/user/project/import/github.md @@ -188,7 +188,7 @@ Completed imports can be re-imported by selecting **Re-import** and specifying n ### Check status of imports -> Details of partially completed imports with a list of entities that failed to import [introduced](https://gitlab.com/gitlab-org/gitlab/-/issues/386748) in GitLab 16.0. +> Details of partially completed imports with a list of entities that failed to import [introduced](https://gitlab.com/gitlab-org/gitlab/-/issues/386748) in GitLab 16.1. After imports are completed, they can be in one of three states: diff --git a/qa/qa/specs/features/browser_ui/1_manage/login/register_spec.rb b/qa/qa/specs/features/browser_ui/1_manage/login/register_spec.rb index f257f1edbc1..5f31ac412d6 100644 --- a/qa/qa/specs/features/browser_ui/1_manage/login/register_spec.rb +++ b/qa/qa/specs/features/browser_ui/1_manage/login/register_spec.rb @@ -112,6 +112,7 @@ module QA let(:user) do Resource::User.fabricate_via_browser_ui! do |user| + user.email_domain = 'gitlab.com' user.expect_fabrication_success = false end end @@ -122,7 +123,6 @@ module QA after do set_require_admin_approval_after_user_signup(false) - user.remove_via_api! if user end it 'allows user login after approval', |