Gitlab configuration change

[Ben Cooksley]

On Sat, Oct 31, 2026 at 3:08 PM Kristen McWilliam <kristen at kde.org> wrote:

> There is a very slim chance that occurs.
> If your MR has passing CI, and the target branch has passing CI, it is
> unlikely that it will be broken by merging the changes in.
>
> Does that have some sort of time-based heuristic?
>
> If the MR last passed CI a few hours ago but needs to rebase, then sure
> probably. If it had green CI weeks/months/years ago though it really
> shouldn't offer to merge without needing to do a CI run IMO.
>

There are no heuristics attached i'm afraid, Gitlab does not offer much in
the way of tweaks / knobs here.

If the change is weeks/months/years old then it probably has merge
conflicts, and Gitlab won't fix those for you.

Cheers,
Ben


> On 2026-10-30 10:00 p.m., Ben Cooksley wrote:
>
> On Sat, Oct 31, 2026 at 2:31 PM Kristen McWilliam <kristen at kde.org> wrote:
>
>> If I read this right, the default will now be to rebase and merge
>> *without* running CI on the rebased state.
>>
>
> Correct.
>
>
>> Will this not lead to merges that successfully rebase but nevertheless
>> have some breakage (that CI would hopefully have caught)?
>>
>
> There is a very slim chance that occurs.
> If your MR has passing CI, and the target branch has passing CI, it is
> unlikely that it will be broken by merging the changes in.
>
> Cheers,
> Ben
>
>
>> On 2026-10-30 09:09 p.m., Ben Cooksley wrote:
>>
>> Hi all,
>>
>> I've just pushed a change which will shortly begin rolling out to our
>> repositories which will enable the "automatic rebase on merge" function of
>> Gitlab.
>> This feature recently became available in Gitlab from 19.2 onward.
>>
>> This means going forward when a merge request is ready to be merged it is
>> no longer necessary to first rebase it and wait for CI to complete before
>> you can merge.
>> Clicking merge will automatically trigger a rebase, skipping CI as
>> required on merge.
>>
>> [image: image.png]
>>
>> If you wish you can select "Rebase with pipeline" to trigger a
>> traditional manual rebase and CI run.
>>
>> Regards,
>> Ben Cooksley
>> KDE Sysadmin
>>
>> --
>> Cheers,
>>   Kristen
>>
>> --
> Cheers,
>   Kristen
>
>
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://mail.kde.org/pipermail/kde-devel/attachments/20261031/ce3d711b/attachment-0001.htm>
-------------- next part --------------
A non-text attachment was scrubbed...
Name: image.png
Type: image/png
Size: 22714 bytes
Desc: not available
URL: <http://mail.kde.org/pipermail/kde-devel/attachments/20261031/ce3d711b/attachment-0001.png>