Merge remote-tracking branch 'ce/master'

app/assets/javascripts/notes/stores/actions.js

@@ -357,11 +357,11 @@ export const poll = ({ commit, state, getters, dispatch }) => {
 };
 
 export const stopPolling = () => {
-  eTagPoll.stop();
+  if (eTagPoll) eTagPoll.stop();
 };
 
 export const restartPolling = () => {
-  eTagPoll.restart();
+  if (eTagPoll) eTagPoll.restart();
 };
 
 export const fetchData = ({ commit, state, getters }) => {

app/assets/stylesheets/pages/help.scss

@@ -38,3 +38,9 @@
 .documentation {
   padding: 7px;
 }
+
+.card.links-card {
+  a {
+    color: $blue-600;
+  }
+}

app/views/help/index.html.haml

@@ -33,7 +33,7 @@
     .documentation-index.md
       = markdown(@help_index)
   .col-md-4
-    .card
+    .card.links-card
       .card-header
         Quick help
       %ul.content-list

changelogs/unreleased/fix-comment-race-condition.yml

+---
+title: Fix commenting before discussions are loaded
+merge_request: 30724
+author:
+type: fixed