Automatic merge of gitlab-org/gitlab-ce master

app/models/clusters/applications/runner.rb

@@ -3,7 +3,7 @@
 module Clusters
   module Applications
     class Runner < ApplicationRecord
-      VERSION = '0.5.0'.freeze
+      VERSION = '0.5.1'.freeze
 
       self.table_name = 'clusters_applications_runners'
 

app/models/repository.rb

@@ -1077,7 +1077,7 @@ class Repository
   end
 
   def rebase(user, merge_request)
-    if Feature.disabled?(:two_step_rebase, default_enabled: true)
+    if Feature.disabled?(:two_step_rebase, default_enabled: false)
       return rebase_deprecated(user, merge_request)
     end
 

changelogs/unreleased/dm-disable-two-step-rebase.yml

+---
+title: Disable two-step rebase which could cause rebases to hang
+merge_request: 28778
+author:
+type: other

changelogs/unreleased/update-gitlab-runner-helm-chart-to-0-5-1.yml

+---
+title: Update GitLab Runner Helm Chart to 0.5.1
+merge_request: 28720
+author:
+type: other