Fixed merge conflicts

This commit is contained in:
Andrii V 2026-02-05 15:58:25 +01:00
commit 4e1b1f6188
7 changed files with 39 additions and 147 deletions

View file

@ -4,7 +4,7 @@
Release Date
^^^^^^^^^^^^
- 2026-02-05
- 2025-01-29
New Features
@ -23,7 +23,7 @@ Security
Fixes
^^^^^
- settings: fixed VCS setting screen crash with some combination of Ai-related settings
- update_server: Moves update server to the rcstack, and fixes issue with wrong file check
Upgrade notes

View file

@ -0,0 +1,33 @@
|RCE| 5.11.2 |RNS|
------------------
Release Date
^^^^^^^^^^^^
- 2026-02-05
New Features
^^^^^^^^^^^^
General
^^^^^^^
Security
^^^^^^^^
Fixes
^^^^^
- settings: fixed VCS setting screen crash with some combination of Ai-related settings
Upgrade notes
^^^^^^^^^^^^^
- RhodeCode 5.11.2 is an unscheduled bugfix release

View file

@ -9,6 +9,7 @@ Release Notes
.. toctree::
:maxdepth: 1
release-notes-5.11.2.rst
release-notes-5.11.1.rst
release-notes-5.11.0.rst
release-notes-5.10.0.rst