Merge branch '2023.11' into 2024.11

ci/gitlab-ci/merge_jobs.yml

@@ -36,8 +36,6 @@ merge:
   stage: merge1
   extends: .abstract.merge
   script:
-    # TODO remove main when github.com/tine20/tine20 is obsolete
-    - merge_merge_upwards 2022.11 main
     - merge_merge_upwards 2022.11 2023.11
     - merge_merge_upwards 2023.11 2024.11
     # BE changes < 2023.11 (TODO remove that when 2022.11 is obsolete)
@@ -54,17 +52,4 @@ merge:
         AUTO_MERGE_VAR: "true"
     - if: $AUTO_MERGE == "true"
     - if: $CI_PIPELINE_SOURCE == "merge_request_event" && $CI_MERGE_REQUEST_LABELS =~ /auto_merge/
-    - if: $PIPELINE_TYPE =~ /auto-merge/
-
-mergemain:
-  stage: merge2
-  extends: .abstract.merge
-  script:
-    - merge_merge_mirror origin main github.com main
-    - merge_merge_mirror github.com main origin main
-    - release_tag_main_if_needed
-    - merge_trigger_next
-  rules:
-    - if: $AUTO_MERGE_MAIN == "true"
-    - if: $CI_PIPELINE_SOURCE == "merge_request_event" && $CI_MERGE_REQUEST_LABELS =~ /auto_merge_main/
-    - if: $PIPELINE_TYPE =~ /auto-merge/
+    - if: $PIPELINE_TYPE =~ /auto-merge/