# Merge remote-tracking branch 'origin/main' into fix/gitlab-offline-remote-discovery · pingdotgg/t3code

[View on GitCafe](https://git.cafe/pingdotgg/t3code/commit/e6120468371b7fca8258b4104bf07b4b3492aa66)

Repository: [pingdotgg/t3code](https://git.cafe/pingdotgg/t3code)

Visibility: public

Requested revision: e6120468371b7fca8258b4104bf07b4b3492aa66

Requested commit: e6120468371b7fca8258b4104bf07b4b3492aa66

Commit: e6120468371b7fca8258b4104bf07b4b3492aa66

Tree: 8d965da6a163dfcc9238401007cbada966323d8d

Author: Julius Marminge

Committer: Julius Marminge

## Message

```
Merge remote-tracking branch 'origin/main' into fix/gitlab-offline-remote-discovery

# Conflicts:
#	packages/source-control-core/src/server/discovery.ts
#	packages/source-control-gitlab/src/server/GitLabSourceControlProvider.test.ts
#	packages/source-control-gitlab/src/server/GitLabSourceControlProvider.ts

```

## Parents

- [e6ad4e0ce9b61652895fb33cf7b88ea2a2d2a179](https://git.cafe/pingdotgg/t3code/commit/e6ad4e0ce9b61652895fb33cf7b88ea2a2d2a179?format=markdown)

- [18f26cf179503f2311b0006f3392cbcd812833ef](https://git.cafe/pingdotgg/t3code/commit/18f26cf179503f2311b0006f3392cbcd812833ef?format=markdown)

[Source at this commit](https://git.cafe/pingdotgg/t3code/tree/e6120468371b7fca8258b4104bf07b4b3492aa66?format=markdown)