Add latest changes from gitlab-org/gitlab@master

3 files changed, 18 insertions, 2 deletions

diff --git a/app/models/merge_request.rb b/app/models/merge_request.rb
index 6987bccadcb..03993506d80 100644
--- a/app/models/merge_request.rb
+++ b/app/models/merge_request.rb
@@ -1383,7 +1383,7 @@ class MergeRequest < ApplicationRecord
 
   def default_merge_commit_message(include_description: false, user: nil)
     if self.target_project.merge_commit_template.present? && !include_description
-      return ::Gitlab::MergeRequests::CommitMessageGenerator.new(merge_request: self, current_user: user).merge_message
+      return ::Gitlab::MergeRequests::MessageGenerator.new(merge_request: self, current_user: user).merge_commit_message
     end
 
     closes_issues_references = visible_closing_issues_for.map do |issue|
@@ -1407,7 +1407,7 @@ class MergeRequest < ApplicationRecord
 
   def default_squash_commit_message(user: nil)
     if self.target_project.squash_commit_template.present?
-      return ::Gitlab::MergeRequests::CommitMessageGenerator.new(merge_request: self, current_user: user).squash_message
+      return ::Gitlab::MergeRequests::MessageGenerator.new(merge_request: self, current_user: user).squash_commit_message
     end
 
     title
diff --git a/app/models/namespace.rb b/app/models/namespace.rb
index d6df73f1c0e..5ee4fbedd5f 100644
--- a/app/models/namespace.rb
+++ b/app/models/namespace.rb
@@ -131,6 +131,8 @@ class Namespace < ApplicationRecord
            to: :namespace_settings, allow_nil: true
   delegate :show_diff_preview_in_email, :show_diff_preview_in_email?, :show_diff_preview_in_email=,
            to: :namespace_settings
+  delegate :runner_registration_enabled, :runner_registration_enabled?, :runner_registration_enabled=,
+           to: :namespace_settings
   delegate :maven_package_requests_forwarding,
            :pypi_package_requests_forwarding,
            :npm_package_requests_forwarding,
@@ -606,6 +608,10 @@ class Namespace < ApplicationRecord
     namespace_settings&.enabled_git_access_protocol
   end
 
+  def all_ancestors_have_runner_registration_enabled?
+    namespace_settings&.all_ancestors_have_runner_registration_enabled?
+  end
+
   private
 
   def cluster_enabled_granted?
diff --git a/app/models/namespace_setting.rb b/app/models/namespace_setting.rb
index 3e6371b0c4d..5081d5cdafe 100644
--- a/app/models/namespace_setting.rb
+++ b/app/models/namespace_setting.rb
@@ -59,6 +59,16 @@ class NamespaceSetting < ApplicationRecord
     all_ancestors_allow_diff_preview_in_email?
   end
 
+  def runner_registration_enabled?
+    runner_registration_enabled && all_ancestors_have_runner_registration_enabled?
+  end
+
+  def all_ancestors_have_runner_registration_enabled?
+    return true unless namespace.has_parent?
+
+    !self.class.where(namespace_id: namespace.ancestors, runner_registration_enabled: false).exists?
+  end
+
   private
 
   def all_ancestors_allow_diff_preview_in_email?