Add latest changes from gitlab-org/gitlab@master

1 files changed, 9 insertions, 3 deletions

diff --git a/tooling/danger/stable_branch.rb b/tooling/danger/stable_branch.rb
index aaaf3cbea8c..2d1a4ef0845 100644
--- a/tooling/danger/stable_branch.rb
+++ b/tooling/danger/stable_branch.rb
@@ -58,7 +58,7 @@ module Tooling
 
       # rubocop:disable Style/SignalException
       def check!
-        return unless non_security_stable_branch?
+        return unless valid_stable_branch?
 
         fail FEATURE_ERROR_MESSAGE if has_feature_label?
         fail BUG_ERROR_MESSAGE unless bug_fixes_only?
@@ -79,12 +79,18 @@ module Tooling
       end
       # rubocop:enable Style/SignalException
 
-      def non_security_stable_branch?
-        !!stable_target_branch && !helper.security_mr?
+      def encourage_package_and_qa_execution?
+        valid_stable_branch? &&
+          !has_only_documentation_changes? &&
+          !has_flaky_failure_label?
       end
 
       private
 
+      def valid_stable_branch?
+        !!stable_target_branch && !helper.security_mr?
+      end
+
       def package_and_test_status
         mr_head_pipeline_id = gitlab.mr_json.dig('head_pipeline', 'id')
         return unless mr_head_pipeline_id