Add latest changes from gitlab-org/gitlab@master

1 files changed, 5 insertions, 1 deletions

diff --git a/tooling/danger/stable_branch.rb b/tooling/danger/stable_branch.rb
index fe3ea835bbc..7da138d4ec4 100644
--- a/tooling/danger/stable_branch.rb
+++ b/tooling/danger/stable_branch.rb
@@ -61,7 +61,7 @@ module Tooling
         return unless non_security_stable_branch?
 
         fail FEATURE_ERROR_MESSAGE if has_feature_label?
-        fail BUG_ERROR_MESSAGE unless has_bug_label?
+        fail BUG_ERROR_MESSAGE unless bug_fixes_only?
 
         warn VERSION_WARNING_MESSAGE unless targeting_patchable_version?
 
@@ -117,6 +117,10 @@ module Tooling
         helper.mr_has_labels?('failure::flaky-test')
       end
 
+      def bug_fixes_only?
+        has_bug_label? || has_only_documentation_changes?
+      end
+
       def has_only_documentation_changes?
         categories_changed = helper.changes_by_category.keys
         return false unless categories_changed.size == 1