From b799e33c0a376d35e031bd292a780163b6732add Mon Sep 17 00:00:00 2001
From: Thomas Randolph <trandolph@gitlab.com>
Date: Fri, 5 Dec 2025 12:51:03 -0700
Subject: [PATCH 01/30] Draft of showing timeline comments on commit

---
 .../rapid_diffs/app/commit/timeline.vue       | 24 +++++++++++++++++++
 .../javascripts/rapid_diffs/commit_app.js     | 24 +++++++++++++++++++
 .../rapid_diffs/app_component.html.haml       |  1 +
 app/components/rapid_diffs/app_component.rb   |  1 +
 .../commit_app_component.html.haml            |  2 ++
 5 files changed, 52 insertions(+)
 create mode 100644 app/assets/javascripts/rapid_diffs/app/commit/timeline.vue

diff --git a/app/assets/javascripts/rapid_diffs/app/commit/timeline.vue b/app/assets/javascripts/rapid_diffs/app/commit/timeline.vue
new file mode 100644
index 00000000000000..99d513bef9cd98
--- /dev/null
+++ b/app/assets/javascripts/rapid_diffs/app/commit/timeline.vue
@@ -0,0 +1,24 @@
+<script>
+import { mapState } from 'pinia';
+import { useDiffDiscussions } from '~/rapid_diffs/stores/diff_discussions';
+import DiffDiscussions from '../discussions/diff_discussions.vue';
+
+export default {
+  name: 'CommitTimeline',
+  components: {
+    DiffDiscussions,
+  },
+  computed: {
+    ...mapState(useDiffDiscussions, ['discussions']),
+    timelineDiscussions() {
+      return this.discussions.filter((discussion) => !discussion.isForm);
+    },
+  },
+};
+</script>
+
+<template>
+  <div v-if="timelineDiscussions.length" class="limited-width-notes gl-mt-5">
+    <diff-discussions :discussions="timelineDiscussions" />
+  </div>
+</template>
diff --git a/app/assets/javascripts/rapid_diffs/commit_app.js b/app/assets/javascripts/rapid_diffs/commit_app.js
index 268f889329dd3b..142f3bb27bf93c 100644
--- a/app/assets/javascripts/rapid_diffs/commit_app.js
+++ b/app/assets/javascripts/rapid_diffs/commit_app.js
@@ -1,3 +1,4 @@
+import Vue from 'vue';
 import { pinia } from '~/pinia/instance';
 import { RapidDiffsFacade } from '~/rapid_diffs/app';
 import { adapters } from '~/rapid_diffs/app/adapter_configs/commit';
@@ -8,6 +9,28 @@ import { s__ } from '~/locale';
 import { initNewDiscussionToggle } from '~/rapid_diffs/app/init_new_discussions_toggle';
 import { useDiffsView } from '~/rapid_diffs/stores/diffs_view';
 import { INLINE_DIFF_VIEW_TYPE } from '~/diffs/constants';
+import CommitTimeline from '~/rapid_diffs/app/commit/timeline.vue';
+
+function initTimeline(appData) {
+  const timelineContainer = document.querySelector('[data-commit-timeline]');
+
+  if (!timelineContainer) return;
+
+  // eslint-disable-next-line no-new
+  new Vue({
+    el: timelineContainer,
+    pinia,
+    provide: {
+      userPermissions: appData.userPermissions,
+      endpoints: {
+        createNote: appData.discussionsEndpoint,
+      },
+    },
+    render(h) {
+      return h(CommitTimeline);
+    },
+  });
+}
 
 class CommitRapidDiffsApp extends RapidDiffsFacade {
   adapterConfig = adapters;
@@ -38,6 +61,7 @@ class CommitRapidDiffsApp extends RapidDiffsFacade {
       } = await axios.get(this.appData.discussionsEndpoint);
       useDiffDiscussions(pinia).setInitialDiscussions(discussions);
       initNewDiscussionToggle(this.root);
+      initTimeline(this.appData);
     } catch (error) {
       createAlert({
         message: s__('RapidDiffs|Failed to load discussions. Try to reload the page.'),
diff --git a/app/components/rapid_diffs/app_component.html.haml b/app/components/rapid_diffs/app_component.html.haml
index ff5f84fa98a96b..45635b207fe8ca 100644
--- a/app/components/rapid_diffs/app_component.html.haml
+++ b/app/components/rapid_diffs/app_component.html.haml
@@ -52,3 +52,4 @@
                   })
         .rd-app-diffs-loading{ data: { list_loading: true }, hidden: !diffs_stream_url }
           = render Pajamas::SpinnerComponent.new(size: :lg)
+        = after_diffs_list
diff --git a/app/components/rapid_diffs/app_component.rb b/app/components/rapid_diffs/app_component.rb
index 3c745bd9af176d..f68d08a526b61f 100644
--- a/app/components/rapid_diffs/app_component.rb
+++ b/app/components/rapid_diffs/app_component.rb
@@ -4,6 +4,7 @@ module RapidDiffs
   class AppComponent < ViewComponent::Base
     renders_one :before_diffs_list
     renders_one :diffs_list
+    renders_one :after_diffs_list
 
     attr_reader :presenter
 
diff --git a/app/components/rapid_diffs/commit_app_component.html.haml b/app/components/rapid_diffs/commit_app_component.html.haml
index 89be627d07503a..aba04642917039 100644
--- a/app/components/rapid_diffs/commit_app_component.html.haml
+++ b/app/components/rapid_diffs/commit_app_component.html.haml
@@ -3,3 +3,5 @@
     - c.with_before_diffs_list do
       %button.rd-new-discussion-toggle{ 'aria-label': s_('RapidDiffs|Add comment'), data: { new_discussion_toggle: true, click: 'newDiscussion' }, hidden: 'true' }
         = helpers.sprite_icon('comment', size: 12)
+  - c.with_after_diffs_list do
+    %div{ data: { commit_timeline: true } }
-- 
GitLab


From 076c95450c9f6ba6f6d63321e7defd6bb13ac1de Mon Sep 17 00:00:00 2001
From: Thomas Randolph <trandolph@gitlab.com>
Date: Fri, 5 Dec 2025 18:03:47 -0700
Subject: [PATCH 02/30] Test Rapid Diffs commit view timeline rendering

---
 .../rapid_diffs/app/init_timeline.js          | 23 ++++++++
 .../javascripts/rapid_diffs/commit_app.js     | 24 +-------
 .../rapid_diffs/app_component_spec.rb         |  9 +++
 .../rapid_diffs/commit_app_component_spec.rb  |  7 +++
 .../rapid_diffs/app/commit/timeline_spec.js   | 55 +++++++++++++++++++
 spec/frontend/rapid_diffs/commit_app_spec.js  | 24 ++++++++
 6 files changed, 119 insertions(+), 23 deletions(-)
 create mode 100644 app/assets/javascripts/rapid_diffs/app/init_timeline.js
 create mode 100644 spec/frontend/rapid_diffs/app/commit/timeline_spec.js

diff --git a/app/assets/javascripts/rapid_diffs/app/init_timeline.js b/app/assets/javascripts/rapid_diffs/app/init_timeline.js
new file mode 100644
index 00000000000000..f59a0ba20356f2
--- /dev/null
+++ b/app/assets/javascripts/rapid_diffs/app/init_timeline.js
@@ -0,0 +1,23 @@
+import Vue from 'vue';
+import { pinia } from '~/pinia/instance';
+import CommitTimeline from './commit/timeline.vue';
+
+export function initTimeline(appData) {
+  const timelineContainer = document.querySelector('[data-commit-timeline]');
+  if (!timelineContainer) return;
+
+  // eslint-disable-next-line no-new
+  new Vue({
+    el: timelineContainer,
+    pinia,
+    provide: {
+      userPermissions: appData.userPermissions,
+      endpoints: {
+        createNote: appData.discussionsEndpoint,
+      },
+    },
+    render(h) {
+      return h(CommitTimeline);
+    },
+  });
+}
diff --git a/app/assets/javascripts/rapid_diffs/commit_app.js b/app/assets/javascripts/rapid_diffs/commit_app.js
index 142f3bb27bf93c..ab3b7346e85cba 100644
--- a/app/assets/javascripts/rapid_diffs/commit_app.js
+++ b/app/assets/javascripts/rapid_diffs/commit_app.js
@@ -1,4 +1,3 @@
-import Vue from 'vue';
 import { pinia } from '~/pinia/instance';
 import { RapidDiffsFacade } from '~/rapid_diffs/app';
 import { adapters } from '~/rapid_diffs/app/adapter_configs/commit';
@@ -9,28 +8,7 @@ import { s__ } from '~/locale';
 import { initNewDiscussionToggle } from '~/rapid_diffs/app/init_new_discussions_toggle';
 import { useDiffsView } from '~/rapid_diffs/stores/diffs_view';
 import { INLINE_DIFF_VIEW_TYPE } from '~/diffs/constants';
-import CommitTimeline from '~/rapid_diffs/app/commit/timeline.vue';
-
-function initTimeline(appData) {
-  const timelineContainer = document.querySelector('[data-commit-timeline]');
-
-  if (!timelineContainer) return;
-
-  // eslint-disable-next-line no-new
-  new Vue({
-    el: timelineContainer,
-    pinia,
-    provide: {
-      userPermissions: appData.userPermissions,
-      endpoints: {
-        createNote: appData.discussionsEndpoint,
-      },
-    },
-    render(h) {
-      return h(CommitTimeline);
-    },
-  });
-}
+import { initTimeline } from '~/rapid_diffs/app/init_timeline';
 
 class CommitRapidDiffsApp extends RapidDiffsFacade {
   adapterConfig = adapters;
diff --git a/spec/components/rapid_diffs/app_component_spec.rb b/spec/components/rapid_diffs/app_component_spec.rb
index 5607b8a9b8cca8..629edeb9973a48 100644
--- a/spec/components/rapid_diffs/app_component_spec.rb
+++ b/spec/components/rapid_diffs/app_component_spec.rb
@@ -160,6 +160,15 @@
     expect(result).to have_text('custom_list')
   end
 
+  it "renders after_diffs_list slot" do
+    result = render_component do |c|
+      c.with_after_diffs_list do
+        'custom_after_content'
+      end
+    end
+    expect(result).to have_text('custom_after_content')
+  end
+
   it "renders diffs list" do
     render_component
     expect(page).to have_css('[data-diffs-list]')
diff --git a/spec/components/rapid_diffs/commit_app_component_spec.rb b/spec/components/rapid_diffs/commit_app_component_spec.rb
index 90d4882332171e..19bff87f09ef33 100644
--- a/spec/components/rapid_diffs/commit_app_component_spec.rb
+++ b/spec/components/rapid_diffs/commit_app_component_spec.rb
@@ -34,6 +34,7 @@
     allow(RapidDiffs::AppComponent).to receive(:new).and_return(app_component)
     allow(app_component).to receive(:render_in).and_yield(app_component)
     allow(app_component).to receive(:with_before_diffs_list).and_yield
+    allow(app_component).to receive(:with_after_diffs_list).and_yield
   end
 
   it "renders app with correct arguments" do
@@ -75,6 +76,12 @@
     end
   end
 
+  it "renders commit timeline container in after_diffs_list slot" do
+    render_component
+
+    expect(page).to have_selector('[data-commit-timeline]', visible: :all)
+  end
+
   def render_component
     render_inline(component)
   end
diff --git a/spec/frontend/rapid_diffs/app/commit/timeline_spec.js b/spec/frontend/rapid_diffs/app/commit/timeline_spec.js
new file mode 100644
index 00000000000000..17709371a44fea
--- /dev/null
+++ b/spec/frontend/rapid_diffs/app/commit/timeline_spec.js
@@ -0,0 +1,55 @@
+import Vue from 'vue';
+import { shallowMount } from '@vue/test-utils';
+import { PiniaVuePlugin } from 'pinia';
+import { createTestingPinia } from '@pinia/testing';
+import CommitTimeline from '~/rapid_diffs/app/commit/timeline.vue';
+import DiffDiscussions from '~/rapid_diffs/app/discussions/diff_discussions.vue';
+import { useDiffDiscussions } from '~/rapid_diffs/stores/diff_discussions';
+
+Vue.use(PiniaVuePlugin);
+
+describe('CommitTimeline', () => {
+  let pinia;
+  let wrapper;
+
+  const createDiscussion = (overrides = {}) => ({
+    id: 'discussion-1',
+    notes: [{ id: 'note-1', body: 'Test note' }],
+    isForm: false,
+    ...overrides,
+  });
+
+  const findDiffDiscussions = () => wrapper.findComponent(DiffDiscussions);
+
+  beforeEach(() => {
+    pinia = createTestingPinia({ stubActions: false });
+  });
+
+  const createComponent = (discussions = []) => {
+    useDiffDiscussions(pinia).$patch({ discussions });
+
+    wrapper = shallowMount(CommitTimeline, {
+      pinia,
+    });
+  };
+
+  it('does not render when there are no discussions', () => {
+    createComponent([]);
+
+    expect(findDiffDiscussions().exists()).toBe(false);
+  });
+
+  it('does not render when all discussions are forms', () => {
+    createComponent([createDiscussion({ id: 'form-1', isForm: true })]);
+
+    expect(findDiffDiscussions().exists()).toBe(false);
+  });
+
+  it('renders filtered discussions', () => {
+    const regularDiscussion = createDiscussion({ id: 'regular-1' });
+    const formDiscussion = createDiscussion({ id: 'form-1', isForm: true });
+    createComponent([regularDiscussion, formDiscussion]);
+
+    expect(findDiffDiscussions().props('discussions')).toEqual([regularDiscussion]);
+  });
+});
diff --git a/spec/frontend/rapid_diffs/commit_app_spec.js b/spec/frontend/rapid_diffs/commit_app_spec.js
index 41f55587687158..522290d13011a0 100644
--- a/spec/frontend/rapid_diffs/commit_app_spec.js
+++ b/spec/frontend/rapid_diffs/commit_app_spec.js
@@ -11,6 +11,7 @@ import { createAlert } from '~/alert';
 import { initNewDiscussionToggle } from '~/rapid_diffs/app/init_new_discussions_toggle';
 import { INLINE_DIFF_VIEW_TYPE, PARALLEL_DIFF_VIEW_TYPE } from '~/diffs/constants';
 import { useDiffsList } from '~/rapid_diffs/stores/diffs_list';
+import { initTimeline } from '~/rapid_diffs/app/init_timeline';
 
 jest.mock('~/alert');
 jest.mock('~/lib/graphql');
@@ -20,6 +21,7 @@ jest.mock('~/rapid_diffs/app/file_browser');
 jest.mock('~/rapid_diffs/app/quirks/safari_fix');
 jest.mock('~/rapid_diffs/app/quirks/content_visibility_fix');
 jest.mock('~/rapid_diffs/app/init_new_discussions_toggle');
+jest.mock('~/rapid_diffs/app/init_timeline');
 
 describe('Commit Rapid Diffs app', () => {
   let axiosMock;
@@ -53,6 +55,7 @@ describe('Commit Rapid Diffs app', () => {
             <div data-file-browser-toggle></div>
             <div data-hidden-files-warning></div>
             <div data-stream-remaining-diffs></div>
+            <div data-commit-timeline></div>
           </div>
         </div>
       </main>
@@ -108,4 +111,25 @@ describe('Commit Rapid Diffs app', () => {
       true,
     );
   });
+
+  it('initializes timeline', async () => {
+    axiosMock.onGet(appData.discussionsEndpoint).reply(HTTP_STATUS_OK, { discussions: [] });
+    createApp();
+    app.init();
+    await app.initDiscussions();
+    expect(initTimeline).toHaveBeenCalledWith(
+      expect.objectContaining({
+        discussionsEndpoint: appData.discussionsEndpoint,
+      }),
+    );
+  });
+
+  it('does not error when timeline container is absent', async () => {
+    axiosMock.onGet(appData.discussionsEndpoint).reply(HTTP_STATUS_OK, { discussions: [] });
+    createApp();
+    app.init();
+    document.querySelector('[data-commit-timeline]').remove();
+
+    await expect(app.initDiscussions()).resolves.not.toThrow();
+  });
 });
-- 
GitLab


From ac0e422f649c3f61cdc3bcbdc029bc3d171003f8 Mon Sep 17 00:00:00 2001
From: Thomas Randolph <trandolph@gitlab.com>
Date: Thu, 11 Dec 2025 23:57:32 -0700
Subject: [PATCH 03/30] Remove diff discussions from the commit timelne

---
 app/assets/javascripts/rapid_diffs/app/commit/timeline.vue | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/assets/javascripts/rapid_diffs/app/commit/timeline.vue b/app/assets/javascripts/rapid_diffs/app/commit/timeline.vue
index 99d513bef9cd98..5f836deab4fe32 100644
--- a/app/assets/javascripts/rapid_diffs/app/commit/timeline.vue
+++ b/app/assets/javascripts/rapid_diffs/app/commit/timeline.vue
@@ -11,7 +11,7 @@ export default {
   computed: {
     ...mapState(useDiffDiscussions, ['discussions']),
     timelineDiscussions() {
-      return this.discussions.filter((discussion) => !discussion.isForm);
+      return this.discussions.filter((discussion) => !discussion.isForm && !discussion.diff_discussion);
     },
   },
 };
-- 
GitLab


From 461897ca6c7e7129c21fd1a25c0659a7a4cc312a Mon Sep 17 00:00:00 2001
From: Thomas Randolph <trandolph@gitlab.com>
Date: Fri, 12 Dec 2025 00:04:50 -0700
Subject: [PATCH 04/30] Move the timeline for commits into the discussions
 folder

---
 .../rapid_diffs/app/{commit => discussions}/timeline.vue        | 2 +-
 app/assets/javascripts/rapid_diffs/app/init_timeline.js         | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)
 rename app/assets/javascripts/rapid_diffs/app/{commit => discussions}/timeline.vue (89%)

diff --git a/app/assets/javascripts/rapid_diffs/app/commit/timeline.vue b/app/assets/javascripts/rapid_diffs/app/discussions/timeline.vue
similarity index 89%
rename from app/assets/javascripts/rapid_diffs/app/commit/timeline.vue
rename to app/assets/javascripts/rapid_diffs/app/discussions/timeline.vue
index 5f836deab4fe32..f2ebe7d12825ba 100644
--- a/app/assets/javascripts/rapid_diffs/app/commit/timeline.vue
+++ b/app/assets/javascripts/rapid_diffs/app/discussions/timeline.vue
@@ -1,7 +1,7 @@
 <script>
 import { mapState } from 'pinia';
 import { useDiffDiscussions } from '~/rapid_diffs/stores/diff_discussions';
-import DiffDiscussions from '../discussions/diff_discussions.vue';
+import DiffDiscussions from './diff_discussions.vue';
 
 export default {
   name: 'CommitTimeline',
diff --git a/app/assets/javascripts/rapid_diffs/app/init_timeline.js b/app/assets/javascripts/rapid_diffs/app/init_timeline.js
index f59a0ba20356f2..c9c866d93db0b9 100644
--- a/app/assets/javascripts/rapid_diffs/app/init_timeline.js
+++ b/app/assets/javascripts/rapid_diffs/app/init_timeline.js
@@ -1,6 +1,6 @@
 import Vue from 'vue';
 import { pinia } from '~/pinia/instance';
-import CommitTimeline from './commit/timeline.vue';
+import CommitTimeline from './discussions/timeline.vue';
 
 export function initTimeline(appData) {
   const timelineContainer = document.querySelector('[data-commit-timeline]');
-- 
GitLab


From 82245019e9d7d991e442d891b1019a4abc752565 Mon Sep 17 00:00:00 2001
From: Thomas Randolph <trandolph@gitlab.com>
Date: Fri, 12 Dec 2025 00:08:47 -0700
Subject: [PATCH 05/30] Provide values and endpoints needed for the timeline
 reply form

---
 app/assets/javascripts/rapid_diffs/app/init_timeline.js | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/app/assets/javascripts/rapid_diffs/app/init_timeline.js b/app/assets/javascripts/rapid_diffs/app/init_timeline.js
index c9c866d93db0b9..9e59df607786bf 100644
--- a/app/assets/javascripts/rapid_diffs/app/init_timeline.js
+++ b/app/assets/javascripts/rapid_diffs/app/init_timeline.js
@@ -14,7 +14,13 @@ export function initTimeline(appData) {
       userPermissions: appData.userPermissions,
       endpoints: {
         createNote: appData.discussionsEndpoint,
+        previewMarkdown: appData.previewMarkdownEndpoint,
+        markdownDocs: appData.markdownDocsEndpoint,
+        register: appData.registerPath,
+        signIn: appData.signInPath,
+        reportAbuse: appData.reportAbusePath,
       },
+      noteableType: appData.noteableType,
     },
     render(h) {
       return h(CommitTimeline);
-- 
GitLab


From 6f24470b85733f9bd7db2c44bece2755cc924aed Mon Sep 17 00:00:00 2001
From: Thomas Randolph <trandolph@gitlab.com>
Date: Fri, 12 Dec 2025 00:21:24 -0700
Subject: [PATCH 06/30] Add the global comment form to the commit timeline

---
 .../rapid_diffs/app/discussions/timeline.vue  | 99 ++++++++++++++++++-
 .../rapid_diffs/stores/diff_discussions.js    |  3 +
 2 files changed, 99 insertions(+), 3 deletions(-)

diff --git a/app/assets/javascripts/rapid_diffs/app/discussions/timeline.vue b/app/assets/javascripts/rapid_diffs/app/discussions/timeline.vue
index f2ebe7d12825ba..699659d72685bc 100644
--- a/app/assets/javascripts/rapid_diffs/app/discussions/timeline.vue
+++ b/app/assets/javascripts/rapid_diffs/app/discussions/timeline.vue
@@ -1,24 +1,117 @@
 <script>
-import { mapState } from 'pinia';
+import { mapState, mapActions } from 'pinia';
+import axios from '~/lib/utils/axios_utils';
+import { createAlert } from '~/alert';
+import { isLoggedIn } from '~/lib/utils/common_utils';
+import { confirmAction } from '~/lib/utils/confirm_via_gl_modal/confirm_via_gl_modal';
+import { ignoreWhilePending } from '~/lib/utils/ignore_while_pending';
+import { detectAndConfirmSensitiveTokens } from '~/lib/utils/secret_detection';
+import { __, s__ } from '~/locale';
+import DiscussionReplyPlaceholder from '~/notes/components/discussion_reply_placeholder.vue';
+import { createNoteErrorMessages } from '~/notes/utils';
 import { useDiffDiscussions } from '~/rapid_diffs/stores/diff_discussions';
 import DiffDiscussions from './diff_discussions.vue';
+import NoteForm from './note_form.vue';
+import NoteSignedOutWidget from './note_signed_out_widget.vue';
 
 export default {
   name: 'CommitTimeline',
   components: {
     DiffDiscussions,
+    DiscussionReplyPlaceholder,
+    NoteForm,
+    NoteSignedOutWidget,
+  },
+  inject: {
+    userPermissions: { type: Object },
+    endpoints: { type: Object },
+  },
+  data() {
+    return {
+      isLoggedIn: isLoggedIn(),
+      isReplying: false,
+    };
   },
   computed: {
     ...mapState(useDiffDiscussions, ['discussions']),
     timelineDiscussions() {
-      return this.discussions.filter((discussion) => !discussion.isForm && !discussion.diff_discussion);
+      return this.discussions.filter(
+        (discussion) => !discussion.isForm && !discussion.diff_discussion,
+      );
+    },
+    showTimeline() {
+      return (
+        this.timelineDiscussions.length || this.userPermissions.can_create_note || !this.isLoggedIn
+      );
+    },
+  },
+  methods: {
+    ...mapActions(useDiffDiscussions, ['addDiscussion']),
+    showReplyForm() {
+      this.isReplying = true;
+    },
+    cancelReplyForm: ignoreWhilePending(async function cancelReplyForm(shouldConfirm, isDirty) {
+      if (shouldConfirm && isDirty) {
+        const confirmed = await confirmAction(
+          s__('Notes|Are you sure you want to cancel creating this comment?'),
+          {
+            primaryBtnText: __('Discard changes'),
+            cancelBtnText: __('Continue editing'),
+          },
+        );
+        if (!confirmed) return;
+      }
+      this.isReplying = false;
+    }),
+    async saveNote(noteText) {
+      if (!noteText) {
+        this.cancelReplyForm();
+        return;
+      }
+
+      const confirmSubmit = await detectAndConfirmSensitiveTokens({ content: noteText });
+      if (!confirmSubmit) return;
+
+      try {
+        const {
+          data: { discussion },
+        } = await axios.post(
+          this.endpoints.createNote,
+          { note: { note: noteText } },
+          { params: { return_discussion: true } },
+        );
+        this.addDiscussion(discussion);
+        this.isReplying = false;
+      } catch (error) {
+        if (error.response) {
+          createAlert({
+            message: createNoteErrorMessages(error.response.data, error.response.status)[0],
+            parent: this.$el,
+          });
+        }
+        throw error;
+      }
     },
   },
 };
 </script>
 
 <template>
-  <div v-if="timelineDiscussions.length" class="limited-width-notes gl-mt-5">
+  <div v-if="showTimeline" class="limited-width-notes gl-mt-5">
     <diff-discussions :discussions="timelineDiscussions" />
+    <div class="gl-rounded-[var(--content-border-radius)] gl-bg-default gl-px-5 gl-py-4">
+      <note-signed-out-widget v-if="!isLoggedIn" />
+      <note-form
+        v-else-if="isReplying"
+        :save-note="saveNote"
+        :save-button-title="__('Comment')"
+        autofocus
+        @cancel="cancelReplyForm"
+      />
+      <discussion-reply-placeholder
+        v-else-if="userPermissions.can_create_note"
+        @focus="showReplyForm"
+      />
+    </div>
   </div>
 </template>
diff --git a/app/assets/javascripts/rapid_diffs/stores/diff_discussions.js b/app/assets/javascripts/rapid_diffs/stores/diff_discussions.js
index bd6be8555574a7..7c5ed335b8296e 100644
--- a/app/assets/javascripts/rapid_diffs/stores/diff_discussions.js
+++ b/app/assets/javascripts/rapid_diffs/stores/diff_discussions.js
@@ -62,6 +62,9 @@ export const useDiffDiscussions = defineStore('diffDiscussions', {
       discussion.notes.splice(discussion.notes.indexOf(note), 1);
       if (discussion.notes.length === 0) this.deleteDiscussion(discussion);
     },
+    addDiscussion(discussion) {
+      this.discussions.push(addReactiveDiscussionProps(discussion));
+    },
     deleteDiscussion(discussion) {
       this.discussions.splice(this.discussions.indexOf(discussion), 1);
     },
-- 
GitLab


From 1aa8c1736ccc3ad066db8eb4b90d2e2f3b7ca2d2 Mon Sep 17 00:00:00 2001
From: Thomas Randolph <trandolph@gitlab.com>
Date: Fri, 12 Dec 2025 00:47:21 -0700
Subject: [PATCH 07/30] Remove short-circuit to enable adding the mountpoint
 for discussions

---
 app/assets/javascripts/rapid_diffs/adapters/discussions.js | 2 --
 1 file changed, 2 deletions(-)

diff --git a/app/assets/javascripts/rapid_diffs/adapters/discussions.js b/app/assets/javascripts/rapid_diffs/adapters/discussions.js
index fc9bc026a7479d..3a8d3d021e4b9e 100644
--- a/app/assets/javascripts/rapid_diffs/adapters/discussions.js
+++ b/app/assets/javascripts/rapid_diffs/adapters/discussions.js
@@ -98,8 +98,6 @@ function addParallelCells(lineRow) {
 
 function createDiscussionMount(createCell) {
   return ({ diffElement, id, position, appData }) => {
-    if (document.querySelector(`[data-discussion-id="${id}"]`)) return;
-
     const cell = createCell(diffElement, position.old_line, position.new_line);
     if (cell.hasMountedApp) return;
     const mountTarget = document.createElement('div');
-- 
GitLab


From 1c3f95e5f39d7f2c32dabfdb9ffe8fde5d1ce6c1 Mon Sep 17 00:00:00 2001
From: Thomas Randolph <trandolph@gitlab.com>
Date: Fri, 12 Dec 2025 01:39:10 -0700
Subject: [PATCH 08/30] Prevent the reply form from showing for system notes

---
 .../rapid_diffs/app/discussions/noteable_discussion.vue       | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/app/assets/javascripts/rapid_diffs/app/discussions/noteable_discussion.vue b/app/assets/javascripts/rapid_diffs/app/discussions/noteable_discussion.vue
index 58fa4c78c02e99..696cb6d0044579 100644
--- a/app/assets/javascripts/rapid_diffs/app/discussions/noteable_discussion.vue
+++ b/app/assets/javascripts/rapid_diffs/app/discussions/noteable_discussion.vue
@@ -54,6 +54,9 @@ export default {
     saveButtonTitle() {
       return this.discussion.internal ? __('Reply internally') : __('Reply');
     },
+    canReply() {
+      return !this.discussion.notes[0]?.system;
+    },
   },
   methods: {
     showReplyForm(text) {
@@ -149,6 +152,7 @@ export default {
       </template>
       <template #footer="{ hasReplies }">
         <li
+          v-if="canReply"
           data-testid="reply-wrapper"
           class="gl-list-none gl-rounded-[var(--content-border-radius)] gl-border-t-subtle gl-bg-subtle gl-px-5 gl-py-4"
           :class="{ 'gl-border-t': !hasReplies, 'gl-pt-0': hasReplies }"
-- 
GitLab


From 88cd248ea573507898ee73c4c2135d95a42abadb Mon Sep 17 00:00:00 2001
From: Thomas Randolph <trandolph@gitlab.com>
Date: Fri, 12 Dec 2025 01:42:44 -0700
Subject: [PATCH 09/30] Add ability to create commit note

---
 app/assets/javascripts/rapid_diffs/app/init_timeline.js | 2 +-
 app/components/rapid_diffs/commit_app_component.rb      | 6 ++++--
 app/presenters/rapid_diffs/commit_presenter.rb          | 4 ++++
 3 files changed, 9 insertions(+), 3 deletions(-)

diff --git a/app/assets/javascripts/rapid_diffs/app/init_timeline.js b/app/assets/javascripts/rapid_diffs/app/init_timeline.js
index 9e59df607786bf..77fe713c9e47fd 100644
--- a/app/assets/javascripts/rapid_diffs/app/init_timeline.js
+++ b/app/assets/javascripts/rapid_diffs/app/init_timeline.js
@@ -13,7 +13,7 @@ export function initTimeline(appData) {
     provide: {
       userPermissions: appData.userPermissions,
       endpoints: {
-        createNote: appData.discussionsEndpoint,
+        createNote: appData.createNoteEndpoint,
         previewMarkdown: appData.previewMarkdownEndpoint,
         markdownDocs: appData.markdownDocsEndpoint,
         register: appData.registerPath,
diff --git a/app/components/rapid_diffs/commit_app_component.rb b/app/components/rapid_diffs/commit_app_component.rb
index 2ef95db5d7bcc5..3db0d2a1236a69 100644
--- a/app/components/rapid_diffs/commit_app_component.rb
+++ b/app/components/rapid_diffs/commit_app_component.rb
@@ -4,8 +4,9 @@ module RapidDiffs
   class CommitAppComponent < ViewComponent::Base
     attr_reader :presenter
 
-    delegate :discussions_endpoint, :user_permissions, :noteable_type, :preview_markdown_endpoint, :markdown_docs_path,
-      :register_path, :sign_in_path, :report_abuse_path, to: :presenter
+    delegate :discussions_endpoint, :create_note_endpoint, :user_permissions, :noteable_type,
+      :preview_markdown_endpoint, :markdown_docs_path, :register_path, :sign_in_path,
+      :report_abuse_path, to: :presenter
 
     def initialize(presenter)
       @presenter = presenter
@@ -17,6 +18,7 @@ def extra_app_data
       {
         user_permissions: user_permissions,
         discussions_endpoint: discussions_endpoint,
+        create_note_endpoint: create_note_endpoint,
         noteable_type: noteable_type,
         preview_markdown_endpoint: preview_markdown_endpoint,
         register_path: register_path,
diff --git a/app/presenters/rapid_diffs/commit_presenter.rb b/app/presenters/rapid_diffs/commit_presenter.rb
index ec9be55bd768e2..904da60b8b0046 100644
--- a/app/presenters/rapid_diffs/commit_presenter.rb
+++ b/app/presenters/rapid_diffs/commit_presenter.rb
@@ -27,6 +27,10 @@ def discussions_endpoint
       discussions_namespace_project_commit_path(project.namespace, resource.project, resource.id)
     end
 
+    def create_note_endpoint
+      project_notes_path(resource.project, target_type: 'commit', target_id: resource.id)
+    end
+
     override(:reload_stream_url)
     def reload_stream_url(offset: nil, diff_view: nil)
       diffs_stream_project_commit_path(
-- 
GitLab


From 24eeaba53662efd346fd2ce0164f13b1722b66d8 Mon Sep 17 00:00:00 2001
From: Thomas Randolph <trandolph@gitlab.com>
Date: Tue, 16 Dec 2025 16:13:50 -0700
Subject: [PATCH 10/30] Move test file for commits to discussions

---
 .../rapid_diffs/app/{commit => discussions}/timeline_spec.js    | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
 rename spec/frontend/rapid_diffs/app/{commit => discussions}/timeline_spec.js (95%)

diff --git a/spec/frontend/rapid_diffs/app/commit/timeline_spec.js b/spec/frontend/rapid_diffs/app/discussions/timeline_spec.js
similarity index 95%
rename from spec/frontend/rapid_diffs/app/commit/timeline_spec.js
rename to spec/frontend/rapid_diffs/app/discussions/timeline_spec.js
index 17709371a44fea..8d00ba003e76ef 100644
--- a/spec/frontend/rapid_diffs/app/commit/timeline_spec.js
+++ b/spec/frontend/rapid_diffs/app/discussions/timeline_spec.js
@@ -2,7 +2,7 @@ import Vue from 'vue';
 import { shallowMount } from '@vue/test-utils';
 import { PiniaVuePlugin } from 'pinia';
 import { createTestingPinia } from '@pinia/testing';
-import CommitTimeline from '~/rapid_diffs/app/commit/timeline.vue';
+import CommitTimeline from '~/rapid_diffs/app/discussions/timeline.vue';
 import DiffDiscussions from '~/rapid_diffs/app/discussions/diff_discussions.vue';
 import { useDiffDiscussions } from '~/rapid_diffs/stores/diff_discussions';
 
-- 
GitLab


From 266122efcfaef2fa3c73eaaf2afd7e3cce20890d Mon Sep 17 00:00:00 2001
From: Thomas Randolph <trandolph@gitlab.com>
Date: Tue, 16 Dec 2025 17:49:20 -0700
Subject: [PATCH 11/30] Switch to discussions endpoint

---
 .../javascripts/rapid_diffs/app/discussions/timeline.vue    | 6 +-----
 app/assets/javascripts/rapid_diffs/app/init_timeline.js     | 2 +-
 app/components/rapid_diffs/commit_app_component.rb          | 3 +--
 app/presenters/rapid_diffs/commit_presenter.rb              | 4 ----
 4 files changed, 3 insertions(+), 12 deletions(-)

diff --git a/app/assets/javascripts/rapid_diffs/app/discussions/timeline.vue b/app/assets/javascripts/rapid_diffs/app/discussions/timeline.vue
index 699659d72685bc..06aaab31f8d591 100644
--- a/app/assets/javascripts/rapid_diffs/app/discussions/timeline.vue
+++ b/app/assets/javascripts/rapid_diffs/app/discussions/timeline.vue
@@ -75,11 +75,7 @@ export default {
       try {
         const {
           data: { discussion },
-        } = await axios.post(
-          this.endpoints.createNote,
-          { note: { note: noteText } },
-          { params: { return_discussion: true } },
-        );
+        } = await axios.post(this.endpoints.discussions, { note: { note: noteText } });
         this.addDiscussion(discussion);
         this.isReplying = false;
       } catch (error) {
diff --git a/app/assets/javascripts/rapid_diffs/app/init_timeline.js b/app/assets/javascripts/rapid_diffs/app/init_timeline.js
index 77fe713c9e47fd..c2b9f07a7dd3e4 100644
--- a/app/assets/javascripts/rapid_diffs/app/init_timeline.js
+++ b/app/assets/javascripts/rapid_diffs/app/init_timeline.js
@@ -13,7 +13,7 @@ export function initTimeline(appData) {
     provide: {
       userPermissions: appData.userPermissions,
       endpoints: {
-        createNote: appData.createNoteEndpoint,
+        discussions: appData.discussionsEndpoint,
         previewMarkdown: appData.previewMarkdownEndpoint,
         markdownDocs: appData.markdownDocsEndpoint,
         register: appData.registerPath,
diff --git a/app/components/rapid_diffs/commit_app_component.rb b/app/components/rapid_diffs/commit_app_component.rb
index 3db0d2a1236a69..b4fbc98a429e70 100644
--- a/app/components/rapid_diffs/commit_app_component.rb
+++ b/app/components/rapid_diffs/commit_app_component.rb
@@ -4,7 +4,7 @@ module RapidDiffs
   class CommitAppComponent < ViewComponent::Base
     attr_reader :presenter
 
-    delegate :discussions_endpoint, :create_note_endpoint, :user_permissions, :noteable_type,
+    delegate :discussions_endpoint, :user_permissions, :noteable_type,
       :preview_markdown_endpoint, :markdown_docs_path, :register_path, :sign_in_path,
       :report_abuse_path, to: :presenter
 
@@ -18,7 +18,6 @@ def extra_app_data
       {
         user_permissions: user_permissions,
         discussions_endpoint: discussions_endpoint,
-        create_note_endpoint: create_note_endpoint,
         noteable_type: noteable_type,
         preview_markdown_endpoint: preview_markdown_endpoint,
         register_path: register_path,
diff --git a/app/presenters/rapid_diffs/commit_presenter.rb b/app/presenters/rapid_diffs/commit_presenter.rb
index 904da60b8b0046..ec9be55bd768e2 100644
--- a/app/presenters/rapid_diffs/commit_presenter.rb
+++ b/app/presenters/rapid_diffs/commit_presenter.rb
@@ -27,10 +27,6 @@ def discussions_endpoint
       discussions_namespace_project_commit_path(project.namespace, resource.project, resource.id)
     end
 
-    def create_note_endpoint
-      project_notes_path(resource.project, target_type: 'commit', target_id: resource.id)
-    end
-
     override(:reload_stream_url)
     def reload_stream_url(offset: nil, diff_view: nil)
       diffs_stream_project_commit_path(
-- 
GitLab


From 29d253ecad0824954b4e4503095ef77a585d2f31 Mon Sep 17 00:00:00 2001
From: Thomas Randolph <trandolph@gitlab.com>
Date: Tue, 16 Dec 2025 18:02:14 -0700
Subject: [PATCH 12/30] Always show the full reply form without a placeholder
 input

---
 .../rapid_diffs/app/discussions/timeline.vue  | 37 ++-----------------
 1 file changed, 3 insertions(+), 34 deletions(-)

diff --git a/app/assets/javascripts/rapid_diffs/app/discussions/timeline.vue b/app/assets/javascripts/rapid_diffs/app/discussions/timeline.vue
index 06aaab31f8d591..ba87c85660c5c8 100644
--- a/app/assets/javascripts/rapid_diffs/app/discussions/timeline.vue
+++ b/app/assets/javascripts/rapid_diffs/app/discussions/timeline.vue
@@ -2,12 +2,9 @@
 import { mapState, mapActions } from 'pinia';
 import axios from '~/lib/utils/axios_utils';
 import { createAlert } from '~/alert';
+import { __ } from '~/locale';
 import { isLoggedIn } from '~/lib/utils/common_utils';
-import { confirmAction } from '~/lib/utils/confirm_via_gl_modal/confirm_via_gl_modal';
-import { ignoreWhilePending } from '~/lib/utils/ignore_while_pending';
 import { detectAndConfirmSensitiveTokens } from '~/lib/utils/secret_detection';
-import { __, s__ } from '~/locale';
-import DiscussionReplyPlaceholder from '~/notes/components/discussion_reply_placeholder.vue';
 import { createNoteErrorMessages } from '~/notes/utils';
 import { useDiffDiscussions } from '~/rapid_diffs/stores/diff_discussions';
 import DiffDiscussions from './diff_discussions.vue';
@@ -18,7 +15,6 @@ export default {
   name: 'CommitTimeline',
   components: {
     DiffDiscussions,
-    DiscussionReplyPlaceholder,
     NoteForm,
     NoteSignedOutWidget,
   },
@@ -29,7 +25,6 @@ export default {
   data() {
     return {
       isLoggedIn: isLoggedIn(),
-      isReplying: false,
     };
   },
   computed: {
@@ -47,27 +42,8 @@ export default {
   },
   methods: {
     ...mapActions(useDiffDiscussions, ['addDiscussion']),
-    showReplyForm() {
-      this.isReplying = true;
-    },
-    cancelReplyForm: ignoreWhilePending(async function cancelReplyForm(shouldConfirm, isDirty) {
-      if (shouldConfirm && isDirty) {
-        const confirmed = await confirmAction(
-          s__('Notes|Are you sure you want to cancel creating this comment?'),
-          {
-            primaryBtnText: __('Discard changes'),
-            cancelBtnText: __('Continue editing'),
-          },
-        );
-        if (!confirmed) return;
-      }
-      this.isReplying = false;
-    }),
     async saveNote(noteText) {
-      if (!noteText) {
-        this.cancelReplyForm();
-        return;
-      }
+      if (!noteText) return;
 
       const confirmSubmit = await detectAndConfirmSensitiveTokens({ content: noteText });
       if (!confirmSubmit) return;
@@ -77,7 +53,6 @@ export default {
           data: { discussion },
         } = await axios.post(this.endpoints.discussions, { note: { note: noteText } });
         this.addDiscussion(discussion);
-        this.isReplying = false;
       } catch (error) {
         if (error.response) {
           createAlert({
@@ -98,15 +73,9 @@ export default {
     <div class="gl-rounded-[var(--content-border-radius)] gl-bg-default gl-px-5 gl-py-4">
       <note-signed-out-widget v-if="!isLoggedIn" />
       <note-form
-        v-else-if="isReplying"
+        v-else-if="userPermissions.can_create_note"
         :save-note="saveNote"
         :save-button-title="__('Comment')"
-        autofocus
-        @cancel="cancelReplyForm"
-      />
-      <discussion-reply-placeholder
-        v-else-if="userPermissions.can_create_note"
-        @focus="showReplyForm"
       />
     </div>
   </div>
-- 
GitLab


From c5264cb3e2b0b9d8b3886b52fba1d934869763f1 Mon Sep 17 00:00:00 2001
From: Thomas Randolph <trandolph@gitlab.com>
Date: Tue, 16 Dec 2025 18:12:15 -0700
Subject: [PATCH 13/30] Do not allow always-expanded reply form to be cancelled

---
 .../javascripts/rapid_diffs/app/discussions/note_form.vue   | 6 ++++++
 .../javascripts/rapid_diffs/app/discussions/timeline.vue    | 1 +
 2 files changed, 7 insertions(+)

diff --git a/app/assets/javascripts/rapid_diffs/app/discussions/note_form.vue b/app/assets/javascripts/rapid_diffs/app/discussions/note_form.vue
index 020b1abcc0ca93..660523493d8864 100644
--- a/app/assets/javascripts/rapid_diffs/app/discussions/note_form.vue
+++ b/app/assets/javascripts/rapid_diffs/app/discussions/note_form.vue
@@ -63,6 +63,11 @@ export default {
       required: false,
       default: true,
     },
+    canCancel: {
+      type: Boolean,
+      required: false,
+      default: true,
+    },
     restoreFromAutosave: {
       type: Boolean,
       required: false,
@@ -184,6 +189,7 @@ export default {
           {{ saveButtonTitle }}
         </gl-button>
         <gl-button
+          v-if="canCancel"
           category="secondary"
           variant="default"
           data-testid="cancel"
diff --git a/app/assets/javascripts/rapid_diffs/app/discussions/timeline.vue b/app/assets/javascripts/rapid_diffs/app/discussions/timeline.vue
index ba87c85660c5c8..251354862fda5d 100644
--- a/app/assets/javascripts/rapid_diffs/app/discussions/timeline.vue
+++ b/app/assets/javascripts/rapid_diffs/app/discussions/timeline.vue
@@ -76,6 +76,7 @@ export default {
         v-else-if="userPermissions.can_create_note"
         :save-note="saveNote"
         :save-button-title="__('Comment')"
+        :can-cancel="false"
       />
     </div>
   </div>
-- 
GitLab


From 7075af4f923fc53316967ff3ae8c54c35eb07850 Mon Sep 17 00:00:00 2001
From: Thomas Randolph <trandolph@gitlab.com>
Date: Tue, 16 Dec 2025 18:17:07 -0700
Subject: [PATCH 14/30] Do not allow replying to non-system notes in commit
 timeline

---
 .../rapid_diffs/app/discussions/noteable_discussion.vue         | 2 +-
 app/serializers/rapid_diffs/discussion_entity.rb                | 1 +
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/app/assets/javascripts/rapid_diffs/app/discussions/noteable_discussion.vue b/app/assets/javascripts/rapid_diffs/app/discussions/noteable_discussion.vue
index 696cb6d0044579..ec971420377bee 100644
--- a/app/assets/javascripts/rapid_diffs/app/discussions/noteable_discussion.vue
+++ b/app/assets/javascripts/rapid_diffs/app/discussions/noteable_discussion.vue
@@ -55,7 +55,7 @@ export default {
       return this.discussion.internal ? __('Reply internally') : __('Reply');
     },
     canReply() {
-      return !this.discussion.notes[0]?.system;
+      return !this.discussion.notes[0]?.system && !this.discussion.individual_note;
     },
   },
   methods: {
diff --git a/app/serializers/rapid_diffs/discussion_entity.rb b/app/serializers/rapid_diffs/discussion_entity.rb
index 77eacb34672f89..a0fa6225b1f11e 100644
--- a/app/serializers/rapid_diffs/discussion_entity.rb
+++ b/app/serializers/rapid_diffs/discussion_entity.rb
@@ -8,6 +8,7 @@ class DiscussionEntity < Grape::Entity
     expose :reply_id
     expose :confidential?, as: :confidential
     expose :diff_discussion?, as: :diff_discussion
+    expose :individual_note?, as: :individual_note
 
     expose :position, if: ->(d, _) { d.diff_discussion? && !d.legacy_diff_discussion? }
 
-- 
GitLab


From d4ed88b67b173eaa47a45d05cfa5f68352cefb96 Mon Sep 17 00:00:00 2001
From: Thomas Randolph <trandolph@gitlab.com>
Date: Tue, 16 Dec 2025 18:31:51 -0700
Subject: [PATCH 15/30] Test skipping the reply wrapper and hiding the cancel
 button

---
 spec/frontend/rapid_diffs/app/discussions/note_form_spec.js  | 5 +++++
 .../rapid_diffs/app/discussions/noteable_discussion_spec.js  | 5 +++++
 2 files changed, 10 insertions(+)

diff --git a/spec/frontend/rapid_diffs/app/discussions/note_form_spec.js b/spec/frontend/rapid_diffs/app/discussions/note_form_spec.js
index 03ec656caf5c89..7b356b5d0fae53 100644
--- a/spec/frontend/rapid_diffs/app/discussions/note_form_spec.js
+++ b/spec/frontend/rapid_diffs/app/discussions/note_form_spec.js
@@ -217,6 +217,11 @@ describe('NoteForm', () => {
       findCancelButton().vm.$emit('click');
       expect(wrapper.emitted('cancel')).toBe(undefined);
     });
+
+    it('hides cancel button when canCancel is false', () => {
+      createComponent({ canCancel: false });
+      expect(findCancelButton().exists()).toBe(false);
+    });
   });
 
   describe('conflicts', () => {
diff --git a/spec/frontend/rapid_diffs/app/discussions/noteable_discussion_spec.js b/spec/frontend/rapid_diffs/app/discussions/noteable_discussion_spec.js
index f3aa3bd8f266c7..2c979e0af761a3 100644
--- a/spec/frontend/rapid_diffs/app/discussions/noteable_discussion_spec.js
+++ b/spec/frontend/rapid_diffs/app/discussions/noteable_discussion_spec.js
@@ -87,6 +87,11 @@ describe('NoteableDiscussion', () => {
     expect(wrapper.findComponent(NoteForm).exists()).toBe(false);
   });
 
+  it('hides reply wrapper for individual notes', () => {
+    createComponent({ props: { discussion: createDiscussion({ individual_note: true }) } });
+    expect(wrapper.find('[data-testid="reply-wrapper"]').exists()).toBe(false);
+  });
+
   it('starts replying', async () => {
     createComponent();
     await wrapper.findComponent(DiscussionReplyPlaceholder).vm.$emit('focus');
-- 
GitLab


From 3ab0b125459cc254cedc6becc8b7cdc51b434ac4 Mon Sep 17 00:00:00 2001
From: Thomas Randolph <trandolph@gitlab.com>
Date: Tue, 16 Dec 2025 18:37:40 -0700
Subject: [PATCH 16/30] Test that individual note is exposed by the
 discussion_entity

---
 spec/serializers/rapid_diffs/discussion_entity_spec.rb | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/spec/serializers/rapid_diffs/discussion_entity_spec.rb b/spec/serializers/rapid_diffs/discussion_entity_spec.rb
index c831c28fd4a96a..5697c26e485fbd 100644
--- a/spec/serializers/rapid_diffs/discussion_entity_spec.rb
+++ b/spec/serializers/rapid_diffs/discussion_entity_spec.rb
@@ -25,7 +25,8 @@
         id: discussion.id,
         reply_id: discussion.reply_id,
         confidential: discussion.confidential?,
-        diff_discussion: discussion.diff_discussion?
+        diff_discussion: discussion.diff_discussion?,
+        individual_note: discussion.individual_note?
       )
     end
 
-- 
GitLab


From 759e7746b6475a1b90a35c349c600b58d9c9cb2c Mon Sep 17 00:00:00 2001
From: Thomas Randolph <trandolph@gitlab.com>
Date: Tue, 16 Dec 2025 18:45:50 -0700
Subject: [PATCH 17/30] Test the timeline method to create a note

---
 .../app/discussions/timeline_spec.js          | 35 ++++++++++++++++++-
 1 file changed, 34 insertions(+), 1 deletion(-)

diff --git a/spec/frontend/rapid_diffs/app/discussions/timeline_spec.js b/spec/frontend/rapid_diffs/app/discussions/timeline_spec.js
index 8d00ba003e76ef..2a0b6947272e56 100644
--- a/spec/frontend/rapid_diffs/app/discussions/timeline_spec.js
+++ b/spec/frontend/rapid_diffs/app/discussions/timeline_spec.js
@@ -2,15 +2,25 @@ import Vue from 'vue';
 import { shallowMount } from '@vue/test-utils';
 import { PiniaVuePlugin } from 'pinia';
 import { createTestingPinia } from '@pinia/testing';
+import AxiosMockAdapter from 'axios-mock-adapter';
+import axios from '~/lib/utils/axios_utils';
+import { HTTP_STATUS_OK } from '~/lib/utils/http_status';
+import { isLoggedIn } from '~/lib/utils/common_utils';
+import { detectAndConfirmSensitiveTokens } from '~/lib/utils/secret_detection';
 import CommitTimeline from '~/rapid_diffs/app/discussions/timeline.vue';
 import DiffDiscussions from '~/rapid_diffs/app/discussions/diff_discussions.vue';
+import NoteForm from '~/rapid_diffs/app/discussions/note_form.vue';
 import { useDiffDiscussions } from '~/rapid_diffs/stores/diff_discussions';
 
+jest.mock('~/lib/utils/common_utils');
+jest.mock('~/lib/utils/secret_detection');
+
 Vue.use(PiniaVuePlugin);
 
 describe('CommitTimeline', () => {
   let pinia;
   let wrapper;
+  let axiosMock;
 
   const createDiscussion = (overrides = {}) => ({
     id: 'discussion-1',
@@ -19,17 +29,26 @@ describe('CommitTimeline', () => {
     ...overrides,
   });
 
+  const defaultProvide = {
+    userPermissions: { can_create_note: true },
+    endpoints: { discussions: '/api/discussions' },
+  };
+
   const findDiffDiscussions = () => wrapper.findComponent(DiffDiscussions);
 
   beforeEach(() => {
     pinia = createTestingPinia({ stubActions: false });
+    axiosMock = new AxiosMockAdapter(axios);
+    isLoggedIn.mockReturnValue(true);
+    detectAndConfirmSensitiveTokens.mockResolvedValue(true);
   });
 
-  const createComponent = (discussions = []) => {
+  const createComponent = (discussions = [], provide = {}) => {
     useDiffDiscussions(pinia).$patch({ discussions });
 
     wrapper = shallowMount(CommitTimeline, {
       pinia,
+      provide: { ...defaultProvide, ...provide },
     });
   };
 
@@ -52,4 +71,18 @@ describe('CommitTimeline', () => {
 
     expect(findDiffDiscussions().props('discussions')).toEqual([regularDiscussion]);
   });
+
+  describe('saveNote', () => {
+    it('adds discussion on successful save', async () => {
+      const newDiscussion = { id: 'new-1', notes: [{ id: 'note-1' }] };
+      axiosMock.onPost('/api/discussions').reply(HTTP_STATUS_OK, { discussion: newDiscussion });
+      createComponent([createDiscussion()]);
+
+      await wrapper.findComponent(NoteForm).props('saveNote')('test note');
+
+      expect(useDiffDiscussions(pinia).discussions).toContainEqual(
+        expect.objectContaining({ id: 'new-1' }),
+      );
+    });
+  });
 });
-- 
GitLab


From 4ad57e38d5006969627020820470b5091bddd360 Mon Sep 17 00:00:00 2001
From: Thomas Randolph <trandolph@gitlab.com>
Date: Tue, 16 Dec 2025 19:40:51 -0700
Subject: [PATCH 18/30] Remove unused parameter

---
 app/assets/javascripts/rapid_diffs/adapters/discussions.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/assets/javascripts/rapid_diffs/adapters/discussions.js b/app/assets/javascripts/rapid_diffs/adapters/discussions.js
index 3a8d3d021e4b9e..e8c803b7587311 100644
--- a/app/assets/javascripts/rapid_diffs/adapters/discussions.js
+++ b/app/assets/javascripts/rapid_diffs/adapters/discussions.js
@@ -97,7 +97,7 @@ function addParallelCells(lineRow) {
 }
 
 function createDiscussionMount(createCell) {
-  return ({ diffElement, id, position, appData }) => {
+  return ({ diffElement, position, appData }) => {
     const cell = createCell(diffElement, position.old_line, position.new_line);
     if (cell.hasMountedApp) return;
     const mountTarget = document.createElement('div');
-- 
GitLab


From 060153949b44339c6758b5f0bb9a342b22c20afa Mon Sep 17 00:00:00 2001
From: Thomas Randolph <trandolph@gitlab.com>
Date: Tue, 16 Dec 2025 19:41:43 -0700
Subject: [PATCH 19/30] Remove unused import that is used farther down in the
 file

---
 app/assets/javascripts/rapid_diffs/app/discussions/timeline.vue | 1 -
 1 file changed, 1 deletion(-)

diff --git a/app/assets/javascripts/rapid_diffs/app/discussions/timeline.vue b/app/assets/javascripts/rapid_diffs/app/discussions/timeline.vue
index 251354862fda5d..70a0b0f6d50819 100644
--- a/app/assets/javascripts/rapid_diffs/app/discussions/timeline.vue
+++ b/app/assets/javascripts/rapid_diffs/app/discussions/timeline.vue
@@ -2,7 +2,6 @@
 import { mapState, mapActions } from 'pinia';
 import axios from '~/lib/utils/axios_utils';
 import { createAlert } from '~/alert';
-import { __ } from '~/locale';
 import { isLoggedIn } from '~/lib/utils/common_utils';
 import { detectAndConfirmSensitiveTokens } from '~/lib/utils/secret_detection';
 import { createNoteErrorMessages } from '~/notes/utils';
-- 
GitLab


From 8e807c704ec31ab97cc56c81889d945b245401d5 Mon Sep 17 00:00:00 2001
From: Thomas Randolph <trandolph@gitlab.com>
Date: Tue, 16 Dec 2025 19:48:05 -0700
Subject: [PATCH 20/30] Update tests to match component construction interface

---
 spec/frontend/rapid_diffs/app/discussions/timeline_spec.js | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/spec/frontend/rapid_diffs/app/discussions/timeline_spec.js b/spec/frontend/rapid_diffs/app/discussions/timeline_spec.js
index 2a0b6947272e56..f3aaa7f3c49786 100644
--- a/spec/frontend/rapid_diffs/app/discussions/timeline_spec.js
+++ b/spec/frontend/rapid_diffs/app/discussions/timeline_spec.js
@@ -53,13 +53,13 @@ describe('CommitTimeline', () => {
   };
 
   it('does not render when there are no discussions', () => {
-    createComponent([]);
+    createComponent([], { userPermissions: { can_create_note: false } });
 
     expect(findDiffDiscussions().exists()).toBe(false);
   });
 
   it('does not render when all discussions are forms', () => {
-    createComponent([createDiscussion({ id: 'form-1', isForm: true })]);
+    createComponent([createDiscussion({ id: 'form-1', isForm: true })], { userPermissions: { can_create_note: false } });
 
     expect(findDiffDiscussions().exists()).toBe(false);
   });
-- 
GitLab


From 363daa5642f55a3cbb7f5a9955002e27dc381417 Mon Sep 17 00:00:00 2001
From: Thomas Randolph <trandolph@gitlab.com>
Date: Tue, 16 Dec 2025 19:49:08 -0700
Subject: [PATCH 21/30] Return the results container instead of a manual filter

---
 .../frontend/rapid_diffs/app/discussions/note_form_spec.js | 7 ++-----
 1 file changed, 2 insertions(+), 5 deletions(-)

diff --git a/spec/frontend/rapid_diffs/app/discussions/note_form_spec.js b/spec/frontend/rapid_diffs/app/discussions/note_form_spec.js
index 7b356b5d0fae53..1f16ac0bef45b5 100644
--- a/spec/frontend/rapid_diffs/app/discussions/note_form_spec.js
+++ b/spec/frontend/rapid_diffs/app/discussions/note_form_spec.js
@@ -42,11 +42,8 @@ describe('NoteForm', () => {
       .findAllComponents(GlButton)
       .filter((buttonWrapper) => buttonWrapper.text() === 'Save comment')
       .at(0);
-  const findCancelButton = () =>
-    wrapper
-      .findAllComponents(GlButton)
-      .filter((buttonWrapper) => buttonWrapper.text() === 'Cancel')
-      .at(0);
+  const findCancelButton = () => wrapper.findByTestId('cancel');
+
 
   beforeEach(() => {
     defaultProps = {
-- 
GitLab


From b4069ebab7ee945a54ceefbf8db87bd01aa1c8aa Mon Sep 17 00:00:00 2001
From: Thomas Randolph <trandolph@gitlab.com>
Date: Tue, 16 Dec 2025 20:00:01 -0700
Subject: [PATCH 22/30] Fix test failures

---
 spec/frontend/rapid_diffs/app/discussions/note_form_spec.js | 4 ++--
 spec/frontend/rapid_diffs/commit_app_spec.js                | 6 ++----
 2 files changed, 4 insertions(+), 6 deletions(-)

diff --git a/spec/frontend/rapid_diffs/app/discussions/note_form_spec.js b/spec/frontend/rapid_diffs/app/discussions/note_form_spec.js
index 1f16ac0bef45b5..262778bbc8e8bc 100644
--- a/spec/frontend/rapid_diffs/app/discussions/note_form_spec.js
+++ b/spec/frontend/rapid_diffs/app/discussions/note_form_spec.js
@@ -1,8 +1,8 @@
 import { merge } from 'lodash';
-import { shallowMount } from '@vue/test-utils';
 import { createTestingPinia } from '@pinia/testing';
 import { GlButton, GlSprintf, GlLink } from '@gitlab/ui';
 import { nextTick } from 'vue';
+import { shallowMountExtended } from 'helpers/vue_test_utils_helper';
 import NoteForm from '~/rapid_diffs/app/discussions/note_form.vue';
 import MarkdownEditor from '~/vue_shared/components/markdown/markdown_editor.vue';
 import { trackSavedUsingEditor } from '~/vue_shared/components/markdown/tracking';
@@ -25,7 +25,7 @@ describe('NoteForm', () => {
   };
 
   const createComponent = (props = {}, provide = {}, stubs = {}) => {
-    wrapper = shallowMount(NoteForm, {
+    wrapper = shallowMountExtended(NoteForm, {
       pinia,
       propsData: {
         ...defaultProps,
diff --git a/spec/frontend/rapid_diffs/commit_app_spec.js b/spec/frontend/rapid_diffs/commit_app_spec.js
index 522290d13011a0..b7c7634a601a77 100644
--- a/spec/frontend/rapid_diffs/commit_app_spec.js
+++ b/spec/frontend/rapid_diffs/commit_app_spec.js
@@ -115,8 +115,7 @@ describe('Commit Rapid Diffs app', () => {
   it('initializes timeline', async () => {
     axiosMock.onGet(appData.discussionsEndpoint).reply(HTTP_STATUS_OK, { discussions: [] });
     createApp();
-    app.init();
-    await app.initDiscussions();
+    await app.init();
     expect(initTimeline).toHaveBeenCalledWith(
       expect.objectContaining({
         discussionsEndpoint: appData.discussionsEndpoint,
@@ -127,9 +126,8 @@ describe('Commit Rapid Diffs app', () => {
   it('does not error when timeline container is absent', async () => {
     axiosMock.onGet(appData.discussionsEndpoint).reply(HTTP_STATUS_OK, { discussions: [] });
     createApp();
-    app.init();
     document.querySelector('[data-commit-timeline]').remove();
 
-    await expect(app.initDiscussions()).resolves.not.toThrow();
+    await expect(app.init()).resolves.not.toThrow();
   });
 });
-- 
GitLab


From ec28a9e29f37a317c66daf04cba34ee409132079 Mon Sep 17 00:00:00 2001
From: Thomas Randolph <trandolph@gitlab.com>
Date: Tue, 16 Dec 2025 20:21:13 -0700
Subject: [PATCH 23/30] Fix linting issues

---
 spec/frontend/rapid_diffs/app/discussions/note_form_spec.js | 1 -
 spec/frontend/rapid_diffs/app/discussions/timeline_spec.js  | 4 +++-
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/spec/frontend/rapid_diffs/app/discussions/note_form_spec.js b/spec/frontend/rapid_diffs/app/discussions/note_form_spec.js
index 262778bbc8e8bc..d348aaf3a06f46 100644
--- a/spec/frontend/rapid_diffs/app/discussions/note_form_spec.js
+++ b/spec/frontend/rapid_diffs/app/discussions/note_form_spec.js
@@ -44,7 +44,6 @@ describe('NoteForm', () => {
       .at(0);
   const findCancelButton = () => wrapper.findByTestId('cancel');
 
-
   beforeEach(() => {
     defaultProps = {
       saveNote: jest.fn().mockResolvedValue(),
diff --git a/spec/frontend/rapid_diffs/app/discussions/timeline_spec.js b/spec/frontend/rapid_diffs/app/discussions/timeline_spec.js
index f3aaa7f3c49786..85be2cbb4028f6 100644
--- a/spec/frontend/rapid_diffs/app/discussions/timeline_spec.js
+++ b/spec/frontend/rapid_diffs/app/discussions/timeline_spec.js
@@ -59,7 +59,9 @@ describe('CommitTimeline', () => {
   });
 
   it('does not render when all discussions are forms', () => {
-    createComponent([createDiscussion({ id: 'form-1', isForm: true })], { userPermissions: { can_create_note: false } });
+    createComponent([createDiscussion({ id: 'form-1', isForm: true })], {
+      userPermissions: { can_create_note: false },
+    });
 
     expect(findDiffDiscussions().exists()).toBe(false);
   });
-- 
GitLab


From 52d7136b79a46d34850cc327aaa65938c5715c19 Mon Sep 17 00:00:00 2001
From: Thomas Randolph <trandolph@gitlab.com>
Date: Wed, 17 Dec 2025 15:19:03 -0700
Subject: [PATCH 24/30] Guard the signed out widget or note form behind the
 correct permissions

---
 .../javascripts/rapid_diffs/app/discussions/timeline.vue     | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/app/assets/javascripts/rapid_diffs/app/discussions/timeline.vue b/app/assets/javascripts/rapid_diffs/app/discussions/timeline.vue
index 70a0b0f6d50819..459414406b19a2 100644
--- a/app/assets/javascripts/rapid_diffs/app/discussions/timeline.vue
+++ b/app/assets/javascripts/rapid_diffs/app/discussions/timeline.vue
@@ -69,7 +69,10 @@ export default {
 <template>
   <div v-if="showTimeline" class="limited-width-notes gl-mt-5">
     <diff-discussions :discussions="timelineDiscussions" />
-    <div class="gl-rounded-[var(--content-border-radius)] gl-bg-default gl-px-5 gl-py-4">
+    <div
+      v-if="!isLoggedIn || userPermissions.can_create_note"
+      class="gl-rounded-[var(--content-border-radius)] gl-bg-default gl-px-5 gl-py-4"
+    >
       <note-signed-out-widget v-if="!isLoggedIn" />
       <note-form
         v-else-if="userPermissions.can_create_note"
-- 
GitLab


From c85d676a55c05cda1060c52c19b6899671a130ca Mon Sep 17 00:00:00 2001
From: Thomas Randolph <trandolph@gitlab.com>
Date: Wed, 17 Dec 2025 15:39:22 -0700
Subject: [PATCH 25/30] Remove guard that would prevent JS fatal errors

---
 app/assets/javascripts/rapid_diffs/app/init_timeline.js | 1 -
 spec/frontend/rapid_diffs/commit_app_spec.js            | 8 --------
 2 files changed, 9 deletions(-)

diff --git a/app/assets/javascripts/rapid_diffs/app/init_timeline.js b/app/assets/javascripts/rapid_diffs/app/init_timeline.js
index c2b9f07a7dd3e4..9857b71ed141ca 100644
--- a/app/assets/javascripts/rapid_diffs/app/init_timeline.js
+++ b/app/assets/javascripts/rapid_diffs/app/init_timeline.js
@@ -4,7 +4,6 @@ import CommitTimeline from './discussions/timeline.vue';
 
 export function initTimeline(appData) {
   const timelineContainer = document.querySelector('[data-commit-timeline]');
-  if (!timelineContainer) return;
 
   // eslint-disable-next-line no-new
   new Vue({
diff --git a/spec/frontend/rapid_diffs/commit_app_spec.js b/spec/frontend/rapid_diffs/commit_app_spec.js
index b7c7634a601a77..77b82bb8acc2fb 100644
--- a/spec/frontend/rapid_diffs/commit_app_spec.js
+++ b/spec/frontend/rapid_diffs/commit_app_spec.js
@@ -122,12 +122,4 @@ describe('Commit Rapid Diffs app', () => {
       }),
     );
   });
-
-  it('does not error when timeline container is absent', async () => {
-    axiosMock.onGet(appData.discussionsEndpoint).reply(HTTP_STATUS_OK, { discussions: [] });
-    createApp();
-    document.querySelector('[data-commit-timeline]').remove();
-
-    await expect(app.init()).resolves.not.toThrow();
-  });
 });
-- 
GitLab


From 7751fbbb9b0c7d2e2ef19b7f8d2b8b4a8954df23 Mon Sep 17 00:00:00 2001
From: Thomas Randolph <trandolph@gitlab.com>
Date: Wed, 17 Dec 2025 15:48:14 -0700
Subject: [PATCH 26/30] Clear draft when saving a note

---
 .../javascripts/rapid_diffs/app/discussions/note_form.vue      | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/app/assets/javascripts/rapid_diffs/app/discussions/note_form.vue b/app/assets/javascripts/rapid_diffs/app/discussions/note_form.vue
index 660523493d8864..5df70fc355b3a4 100644
--- a/app/assets/javascripts/rapid_diffs/app/discussions/note_form.vue
+++ b/app/assets/javascripts/rapid_diffs/app/discussions/note_form.vue
@@ -1,6 +1,7 @@
 <script>
 import { GlButton, GlSprintf, GlLink, GlAlert } from '@gitlab/ui';
 import { __ } from '~/locale';
+import { clearDraft } from '~/lib/utils/autosave';
 import MarkdownEditor from '~/vue_shared/components/markdown/markdown_editor.vue';
 import { trackSavedUsingEditor } from '~/vue_shared/components/markdown/tracking';
 import { COMMENT_FORM } from '~/notes/i18n';
@@ -133,6 +134,8 @@ export default {
       );
       try {
         await this.saveNote(this.editedNoteBody, shiftPressed);
+        this.editedNoteBody = '';
+        clearDraft(this.autosaveKey);
       } finally {
         this.isSubmitting = false;
       }
-- 
GitLab


From fefd97a0b2845effedc8c3c6bcb8a3234230b3ff Mon Sep 17 00:00:00 2001
From: Thomas Randolph <trandolph@gitlab.com>
Date: Wed, 17 Dec 2025 15:54:10 -0700
Subject: [PATCH 27/30] Handle individual notes

---
 .../rapid_diffs/app/discussions/discussion_notes.vue       | 7 ++++++-
 .../rapid_diffs/app/discussions/noteable_discussion.vue    | 1 +
 2 files changed, 7 insertions(+), 1 deletion(-)

diff --git a/app/assets/javascripts/rapid_diffs/app/discussions/discussion_notes.vue b/app/assets/javascripts/rapid_diffs/app/discussions/discussion_notes.vue
index 35ed20d1dd5702..0de502e2ef05f9 100644
--- a/app/assets/javascripts/rapid_diffs/app/discussions/discussion_notes.vue
+++ b/app/assets/javascripts/rapid_diffs/app/discussions/discussion_notes.vue
@@ -25,6 +25,11 @@ export default {
       required: false,
       default: true,
     },
+    individual: {
+      type: Boolean,
+      required: false,
+      default: false,
+    },
   },
   computed: {
     hasReplies() {
@@ -46,7 +51,7 @@ export default {
     <noteable-note
       v-else
       :note="firstNote"
-      :show-reply-button="userPermissions.can_create_note"
+      :show-reply-button="userPermissions.can_create_note && !individual"
       @noteDeleted="$emit('noteDeleted', firstNote)"
       @noteUpdated="$emit('noteUpdated', $event)"
       @noteEdited="$emit('noteEdited', { note: firstNote, value: $event })"
diff --git a/app/assets/javascripts/rapid_diffs/app/discussions/noteable_discussion.vue b/app/assets/javascripts/rapid_diffs/app/discussions/noteable_discussion.vue
index ec971420377bee..6225f27ea88bd6 100644
--- a/app/assets/javascripts/rapid_diffs/app/discussions/noteable_discussion.vue
+++ b/app/assets/javascripts/rapid_diffs/app/discussions/noteable_discussion.vue
@@ -138,6 +138,7 @@ export default {
     <discussion-notes
       :notes="discussion.notes"
       :expanded="discussion.repliesExpanded"
+      :individual="discussion.individual_note"
       @toggleDiscussionReplies="$emit('toggleDiscussionReplies')"
       @startReplying="showReplyForm"
       @noteUpdated="$emit('noteUpdated', $event)"
-- 
GitLab


From d3879980dc7dd63166537945f5d16c83f2e76dc8 Mon Sep 17 00:00:00 2001
From: Thomas Randolph <trandolph@gitlab.com>
Date: Wed, 17 Dec 2025 16:02:14 -0700
Subject: [PATCH 28/30] Always render the timeline container

---
 .../rapid_diffs/app/discussions/timeline.vue       |  7 +------
 .../rapid_diffs/app/discussions/timeline_spec.js   | 14 --------------
 2 files changed, 1 insertion(+), 20 deletions(-)

diff --git a/app/assets/javascripts/rapid_diffs/app/discussions/timeline.vue b/app/assets/javascripts/rapid_diffs/app/discussions/timeline.vue
index 459414406b19a2..1d1d2266709926 100644
--- a/app/assets/javascripts/rapid_diffs/app/discussions/timeline.vue
+++ b/app/assets/javascripts/rapid_diffs/app/discussions/timeline.vue
@@ -33,11 +33,6 @@ export default {
         (discussion) => !discussion.isForm && !discussion.diff_discussion,
       );
     },
-    showTimeline() {
-      return (
-        this.timelineDiscussions.length || this.userPermissions.can_create_note || !this.isLoggedIn
-      );
-    },
   },
   methods: {
     ...mapActions(useDiffDiscussions, ['addDiscussion']),
@@ -67,7 +62,7 @@ export default {
 </script>
 
 <template>
-  <div v-if="showTimeline" class="limited-width-notes gl-mt-5">
+  <div class="limited-width-notes gl-mt-5">
     <diff-discussions :discussions="timelineDiscussions" />
     <div
       v-if="!isLoggedIn || userPermissions.can_create_note"
diff --git a/spec/frontend/rapid_diffs/app/discussions/timeline_spec.js b/spec/frontend/rapid_diffs/app/discussions/timeline_spec.js
index 85be2cbb4028f6..5b5b27d5622f4a 100644
--- a/spec/frontend/rapid_diffs/app/discussions/timeline_spec.js
+++ b/spec/frontend/rapid_diffs/app/discussions/timeline_spec.js
@@ -52,20 +52,6 @@ describe('CommitTimeline', () => {
     });
   };
 
-  it('does not render when there are no discussions', () => {
-    createComponent([], { userPermissions: { can_create_note: false } });
-
-    expect(findDiffDiscussions().exists()).toBe(false);
-  });
-
-  it('does not render when all discussions are forms', () => {
-    createComponent([createDiscussion({ id: 'form-1', isForm: true })], {
-      userPermissions: { can_create_note: false },
-    });
-
-    expect(findDiffDiscussions().exists()).toBe(false);
-  });
-
   it('renders filtered discussions', () => {
     const regularDiscussion = createDiscussion({ id: 'regular-1' });
     const formDiscussion = createDiscussion({ id: 'form-1', isForm: true });
-- 
GitLab


From 652c6417edbdeae58ce74586a72a72fd908f3632 Mon Sep 17 00:00:00 2001
From: Thomas Randolph <trandolph@gitlab.com>
Date: Wed, 17 Dec 2025 18:12:16 -0700
Subject: [PATCH 29/30] Do not auto-focus the auto-expanded note form

---
 app/assets/javascripts/rapid_diffs/app/discussions/timeline.vue | 1 +
 1 file changed, 1 insertion(+)

diff --git a/app/assets/javascripts/rapid_diffs/app/discussions/timeline.vue b/app/assets/javascripts/rapid_diffs/app/discussions/timeline.vue
index 1d1d2266709926..fc2da869500b24 100644
--- a/app/assets/javascripts/rapid_diffs/app/discussions/timeline.vue
+++ b/app/assets/javascripts/rapid_diffs/app/discussions/timeline.vue
@@ -74,6 +74,7 @@ export default {
         :save-note="saveNote"
         :save-button-title="__('Comment')"
         :can-cancel="false"
+        :autofocus="false"
       />
     </div>
   </div>
-- 
GitLab


From 2ed5060b19b658d6094a9178f2e17b75abe27d71 Mon Sep 17 00:00:00 2001
From: Thomas Randolph <trandolph@gitlab.com>
Date: Wed, 17 Dec 2025 18:13:56 -0700
Subject: [PATCH 30/30] Remove .limited-width-notes class

---
 app/assets/javascripts/rapid_diffs/app/discussions/timeline.vue | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/assets/javascripts/rapid_diffs/app/discussions/timeline.vue b/app/assets/javascripts/rapid_diffs/app/discussions/timeline.vue
index fc2da869500b24..22c9543b0c2d36 100644
--- a/app/assets/javascripts/rapid_diffs/app/discussions/timeline.vue
+++ b/app/assets/javascripts/rapid_diffs/app/discussions/timeline.vue
@@ -62,7 +62,7 @@ export default {
 </script>
 
 <template>
-  <div class="limited-width-notes gl-mt-5">
+  <div class="gl-mt-5">
     <diff-discussions :discussions="timelineDiscussions" />
     <div
       v-if="!isLoggedIn || userPermissions.can_create_note"
-- 
GitLab