Automatic merge of gitlab-org/gitlab-ce master

app/assets/javascripts/confidential_merge_request/components/project_form_group.vue

@@ -126,10 +126,6 @@ export default {
           {{ __('No forks available to you.') }}<br />
           <span v-html="noForkText"></span>
         </template>
-        <gl-link :href="helpPagePath" class="help-link" target="_blank">
-          <span class="sr-only">{{ __('Read more') }}</span>
-          <i class="fa fa-question-circle" aria-hidden="true"></i>
-        </gl-link>
       </p>
     </div>
   </div>

app/assets/stylesheets/framework/dropdowns.scss

@@ -287,8 +287,8 @@
     list-style: none;
     padding: 0 1px;
 
-    a:not(.help-link),
-    button:not(.btn),
+    a,
+    button:not(.dropdown-toggle,.ci-action-icon-container),
     .menu-item {
       @include dropdown-link;
     }

app/services/issuable_base_service.rb

@@ -182,7 +182,7 @@ class IssuableBaseService < BaseService
     # To be overridden by subclasses
   end
 
-  def before_update(issuable)
+  def before_update(issuable, skip_spam_check: false)
     # To be overridden by subclasses
   end
 
@@ -257,7 +257,7 @@ class IssuableBaseService < BaseService
                                               last_edited_at: Time.now,
                                               last_edited_by: current_user))
 
-      before_update(issuable)
+      before_update(issuable, skip_spam_check: true)
 
       if issuable.with_transaction_returning_status { issuable.save }
         # We do not touch as it will affect a update on updated_at field

app/services/issues/update_service.rb

@@ -17,8 +17,8 @@ module Issues
       super
     end
 
-    def before_update(issue)
-      spam_check(issue, current_user)
+    def before_update(issue, skip_spam_check: false)
+      spam_check(issue, current_user) unless skip_spam_check
     end
 
     def handle_changes(issue, options)

changelogs/unreleased/issue_64021.yml

+---
+title: Skip spam check for task list updates
+merge_request: 30279
+author:
+type: fixed

spec/frontend/confidential_merge_request/components/__snapshots__/project_form_group_spec.js.snap

@@ -28,23 +28,6 @@ exports[`Confidential merge request project form group component renders empty s
         </a>
          and set the forks visiblity to private.
       </span>
-       
-      <gllink-stub
-        class="help-link"
-        href="/help"
-        target="_blank"
-      >
-        <span
-          class="sr-only"
-        >
-          Read more
-        </span>
-         
-        <i
-          aria-hidden="true"
-          class="fa fa-question-circle"
-        />
-      </gllink-stub>
     </p>
   </div>
 </div>
@@ -78,23 +61,6 @@ exports[`Confidential merge request project form group component renders fork dr
         </a>
          and set the forks visiblity to private.
       </span>
-       
-      <gllink-stub
-        class="help-link"
-        href="/help"
-        target="_blank"
-      >
-        <span
-          class="sr-only"
-        >
-          Read more
-        </span>
-         
-        <i
-          aria-hidden="true"
-          class="fa fa-question-circle"
-        />
-      </gllink-stub>
     </p>
   </div>
 </div>

spec/services/issues/update_service_spec.rb

@@ -480,6 +480,22 @@ describe Issues::UpdateService, :mailer do
           update_issue(description: "- [x] Task 1\n- [X] Task 2")
         end
 
+        it 'does not check for spam on task status change' do
+          params = {
+            update_task: {
+              index: 1,
+              checked: false,
+              line_source: '- [x] Task 1',
+              line_number: 1
+            }
+          }
+          service = described_class.new(project, user, params)
+
+          expect(service).not_to receive(:spam_check)
+
+          service.execute(issue)
+        end
+
         it 'creates system note about task status change' do
           note1 = find_note('marked the task **Task 1** as completed')
           note2 = find_note('marked the task **Task 2** as completed')