Commit 7067c6bc authored by Constance Okoghenun's avatar Constance Okoghenun

Resolve commit comments displayed on a merge request

- Added missing i18n strings
- Added changelog entry
- Fixed lint errors
parent 682a4393
---
title: Display "commented" only for commit discussions on merge requests
merge_request: 24427
author:
type: changed
...@@ -4294,6 +4294,9 @@ msgstr "" ...@@ -4294,6 +4294,9 @@ msgstr ""
msgid "MergeRequests|View replaced file @ %{commitId}" msgid "MergeRequests|View replaced file @ %{commitId}"
msgstr "" msgstr ""
msgid "MergeRequests|commented on commit "
msgstr ""
msgid "MergeRequests|started a discussion" msgid "MergeRequests|started a discussion"
msgstr "" msgstr ""
......
...@@ -91,7 +91,7 @@ describe 'Merge request > User sees discussions', :js do ...@@ -91,7 +91,7 @@ describe 'Merge request > User sees discussions', :js do
context 'a commit non-diff discussion' do context 'a commit non-diff discussion' do
let(:note) { create(:discussion_note_on_commit, project: project) } let(:note) { create(:discussion_note_on_commit, project: project) }
it 'displays correct header' do it 'displays correct header' do
page.within(find("#note_#{note.id}", match: :first)) do page.within(find("#note_#{note.id}", match: :first)) do
refresh # Trigger a refresh of notes. refresh # Trigger a refresh of notes.
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment