Resolve commit comments displayed on a merge request
- Added missing i18n strings - Added changelog entry - Fixed lint errors
This commit is contained in:
parent
682a43932d
commit
7067c6bc41
|
@ -0,0 +1,5 @@
|
|||
---
|
||||
title: Display "commented" only for commit discussions on merge requests
|
||||
merge_request: 24427
|
||||
author:
|
||||
type: changed
|
|
@ -4294,6 +4294,9 @@ msgstr ""
|
|||
msgid "MergeRequests|View replaced file @ %{commitId}"
|
||||
msgstr ""
|
||||
|
||||
msgid "MergeRequests|commented on commit "
|
||||
msgstr ""
|
||||
|
||||
msgid "MergeRequests|started a discussion"
|
||||
msgstr ""
|
||||
|
||||
|
|
|
@ -91,7 +91,7 @@ describe 'Merge request > User sees discussions', :js do
|
|||
|
||||
context 'a commit non-diff discussion' do
|
||||
let(:note) { create(:discussion_note_on_commit, project: project) }
|
||||
|
||||
|
||||
it 'displays correct header' do
|
||||
page.within(find("#note_#{note.id}", match: :first)) do
|
||||
refresh # Trigger a refresh of notes.
|
||||
|
|
Loading…
Reference in New Issue