From 8782079dccffc9803e3b80c365e5e63dce65ca08 Mon Sep 17 00:00:00 2001
From: Andras Bacsai <5845193+andrasbacsai@users.noreply.github.com>
Date: Tue, 21 Jul 2026 21:00:34 +0200
Subject: [PATCH] fix(ui): place GitLab group name after application secret

Keep the primary setup/credentials flow ordered as name, OAuth
credentials, then group name, with self-hosted URL fields advanced-only.
---
 resources/views/livewire/source/gitlab/change.blade.php | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/resources/views/livewire/source/gitlab/change.blade.php b/resources/views/livewire/source/gitlab/change.blade.php
index 830a9a0a7..a1e41c68a 100644
--- a/resources/views/livewire/source/gitlab/change.blade.php
+++ b/resources/views/livewire/source/gitlab/change.blade.php
@@ -29,8 +29,6 @@
             </div>
             <div class="flex flex-col gap-2">
                 <x-forms.input canGate="update" :canResource="$gitlab_app" id="name" label="Name" />
-                <x-forms.input canGate="update" :canResource="$gitlab_app" id="groupName" label="Group Name"
-                    helper="Comma-separated group names to filter visible repositories." />
                 @if (!isCloud())
                     <div class="w-48">
                         <x-forms.checkbox canGate="update" :canResource="$gitlab_app" label="System Wide"
@@ -49,6 +47,8 @@
                 <h3 class="pt-4">OAuth Credentials</h3>
                 <x-forms.input canGate="update" :canResource="$gitlab_app" id="clientId" label="Application ID" />
                 <x-forms.input canGate="update" :canResource="$gitlab_app" id="clientSecretInput" label="Application Secret" type="password" />
+                <x-forms.input canGate="update" :canResource="$gitlab_app" id="groupName" label="Group Name"
+                    helper="Comma-separated group names to filter visible repositories." />
 
                 <div x-data="{
                                         activeAccordion: '',
@@ -170,6 +170,8 @@
                     helper="The Application ID from your GitLab OAuth Application." />
                 <x-forms.input id="clientSecretInput" label="Application Secret" type="password" required
                     helper="The Secret from your GitLab OAuth Application." />
+                <x-forms.input id="groupName" label="Group Name"
+                    helper="Optional. Comma-separated group names to filter repositories." />
 
                 <div x-data="{
                                         activeAccordion: '',
@@ -196,8 +198,6 @@
                                     <x-forms.input id="apiUrl" label="API URL"
                                         helper="Usually your GitLab URL with /api/v4 appended." />
                                 </div>
-                                <x-forms.input id="groupName" label="Group Name"
-                                    helper="Optional. Comma-separated group names to filter repositories." />
                                 <div class="flex gap-2">
                                     <x-forms.input id="customUser" label="SSH User" />
                                     <x-forms.input type="number" id="customPort" label="SSH Port" />