fix: use configured Gitlab URI for integration calls by default

.env.example

@@ -77,6 +77,11 @@ GITHUB_CLIENT_ID=
 GITHUB_CLIENT_SECRET=
 GITHUB_REDIRECT_URI="${APP_URL}/auth/github/callback"
 
+GITLAB_CLIENT_ID=
+GITLAB_CLIENT_SECRET=
+GITLAB_REDIRECT_URI="${APP_URL}/auth/gitlab/callback"
+GITLAB_INSTANCE_URI=https://gitlab.com/
+
 REVERB_APP_ID=
 REVERB_APP_KEY=
 REVERB_APP_SECRET=

app/Domains/Repository/Actions/BulkCreateRepositoriesAction.php

@@ -86,6 +86,6 @@ private function resolveBaseUrl(GitProvider $provider, string $userUuid): ?strin
             ->where('provider', $provider)
             ->first();
 
-        return $credential?->credentials['url'] ?? null;
+        return $credential?->credentials['url'] ?? config('services.gitlab.instance_uri');
     }
 }

app/Domains/Repository/Http/Controllers/RepositoryController.php

@@ -235,6 +235,6 @@ private function resolveBaseUrl(GitProvider $provider, string $userUuid): ?strin
             ->where('provider', $provider)
             ->first();
 
-        return $credential?->credentials['url'] ?? null;
+        return $credential?->credentials['url'] ?? config('services.gitlab.instance_uri');
     }
 }

app/Domains/Repository/Services/GitProviders/GitLabProvider.php

@@ -57,7 +57,7 @@ protected function configureHttpClient(): PendingRequest
 
     public function getBaseUrl(): string
     {
-        return rtrim($this->getCredential('url', 'https://gitlab.com'), '/');
+        return rtrim($this->getCredential('url', config('services.gitlab.instance_uri')), '/');
     }
 
     protected function getEncodedProjectPath(): string

app/Http/Controllers/Settings/UserGitCredentialController.php

@@ -29,6 +29,7 @@ public function index(): Response
             'providers' => GitProvider::options(),
             'githubConnectUrl' => route('settings.github.connect'),
             'gitlabConnectUrl' => route('settings.gitlab.connect'),
+            'gitlabInstanceUri' => rtrim(config('services.gitlab.instance_uri'), '/'),
         ]);
     }
 

resources/js/components/git-credential-dialog.tsx

@@ -25,6 +25,7 @@ interface GitCredentialDialogProps {
     providers: Record<string, string>;
     githubConnectUrl?: string;
     gitlabConnectUrl?: string;
+    gitlabInstanceUri: string;
     isOpen: boolean;
     onClose: () => void;
 }
@@ -35,6 +36,7 @@ export default function GitCredentialDialog({
     providers,
     githubConnectUrl,
     gitlabConnectUrl,
+    gitlabInstanceUri,
     isOpen,
     onClose,
 }: GitCredentialDialogProps) {
@@ -196,11 +198,14 @@ export default function GitCredentialDialog({
                                 id="url"
                                 name="credentials[url]"
                                 type="url"
-                                placeholder="https://gitlab.com"
+                                placeholder={gitlabInstanceUri}
                             />
                             <p className="text-sm text-muted-foreground">
-                                Leave empty for GitLab.com, or enter your
-                                self-hosted GitLab instance URL
+                                Leave empty for{' '}
+                                <span className="font-mono">
+                                    {gitlabInstanceUri}
+                                </span>
+                                , or enter another GitLab instance URL.
                             </p>
                         </div>
                     </>

resources/js/pages/settings/git-credentials.tsx

@@ -26,6 +26,7 @@ interface GitCredentialsPageProps {
     providers: Record<string, string>;
     githubConnectUrl: string;
     gitlabConnectUrl: string;
+    gitlabInstanceUri: string;
 }
 
 const breadcrumbs: BreadcrumbItem[] = [
@@ -44,6 +45,7 @@ export default function GitCredentials({
     providers,
     githubConnectUrl,
     gitlabConnectUrl,
+    gitlabInstanceUri,
 }: GitCredentialsPageProps) {
     const [dialogOpen, setDialogOpen] = useState(false);
     const [editingCredential, setEditingCredential] =
@@ -255,6 +257,7 @@ export default function GitCredentials({
                             providers={providers}
                             githubConnectUrl={githubConnectUrl}
                             gitlabConnectUrl={gitlabConnectUrl}
+                            gitlabInstanceUri={gitlabInstanceUri}
                             isOpen={dialogOpen}
                             onClose={() => {
                                 setDialogOpen(false);