Merge pull request #8523 from gitbutlerapp/fix-gitlab-stuff

Fix some broken GitLab stuff

Author: krlvi

apps/desktop/src/components/ReviewCreation.svelte

@@ -17,6 +17,7 @@
 	import { ButRequestDetailsService } from '$lib/forge/butRequestDetailsService';
 	import { DefaultForgeFactory } from '$lib/forge/forgeFactory.svelte';
 	import { mapErrorToToast } from '$lib/forge/github/errorMap';
+	import { GitHubPrService } from '$lib/forge/github/githubPrService.svelte';
 	import { type PullRequest } from '$lib/forge/interface/types';
 	import { ReactivePRBody, ReactivePRTitle } from '$lib/forge/prContents.svelte';
 	import {
@@ -292,9 +293,12 @@
 
 			const repoInfo = parseRemoteUrl(pushRemoteUrl);
 
-			const upstreamName = repoInfo?.owner
-				? `${repoInfo.owner}:${params.upstreamBranchName}`
-				: params.upstreamBranchName;
+			const upstreamName =
+				prService instanceof GitHubPrService
+					? repoInfo?.owner
+						? `${repoInfo.owner}:${params.upstreamBranchName}`
+						: params.upstreamBranchName
+					: params.upstreamBranchName;
 
 			const pr = await prService.createPr({
 				title: params.title,

apps/desktop/src/lib/forge/gitlab/gitlabPrService.svelte.ts

@@ -115,7 +115,7 @@ function injectEndpoints(api: GitLabApi) {
 				queryFn: async ({ head, base, title, body }, query) => {
 					const { api, upstreamProjectId, forkProjectId } = gitlab(query.extra);
 					const upstreamProject = await api.Projects.show(upstreamProjectId);
-					const mr = await api.MergeRequests.create(forkProjectId, base, head, title, {
+					const mr = await api.MergeRequests.create(forkProjectId, head, base, title, {
 						description: body,
 						targetProjectId: upstreamProject.id,
 						removeSourceBranch: true