From 7067c6bc4191ea80a91ddf2bca9c1f0c37f870a5 Mon Sep 17 00:00:00 2001 From: Constance Okoghenun Date: Mon, 21 Jan 2019 05:46:27 +0100 Subject: [PATCH] Resolve commit comments displayed on a merge request - Added missing i18n strings - Added changelog entry - Fixed lint errors --- .../53950-commit-comments-displayed-on-a-merge-request.yml | 5 +++++ locale/gitlab.pot | 3 +++ spec/features/merge_request/user_sees_discussions_spec.rb | 2 +- 3 files changed, 9 insertions(+), 1 deletion(-) create mode 100644 changelogs/unreleased/53950-commit-comments-displayed-on-a-merge-request.yml diff --git a/changelogs/unreleased/53950-commit-comments-displayed-on-a-merge-request.yml b/changelogs/unreleased/53950-commit-comments-displayed-on-a-merge-request.yml new file mode 100644 index 00000000000..adaaed7f1aa --- /dev/null +++ b/changelogs/unreleased/53950-commit-comments-displayed-on-a-merge-request.yml @@ -0,0 +1,5 @@ +--- +title: Display "commented" only for commit discussions on merge requests +merge_request: 24427 +author: +type: changed diff --git a/locale/gitlab.pot b/locale/gitlab.pot index 404cb079371..137050e1a36 100644 --- a/locale/gitlab.pot +++ b/locale/gitlab.pot @@ -4294,6 +4294,9 @@ msgstr "" msgid "MergeRequests|View replaced file @ %{commitId}" msgstr "" +msgid "MergeRequests|commented on commit " +msgstr "" + msgid "MergeRequests|started a discussion" msgstr "" diff --git a/spec/features/merge_request/user_sees_discussions_spec.rb b/spec/features/merge_request/user_sees_discussions_spec.rb index d2b909aee11..57be1d06708 100644 --- a/spec/features/merge_request/user_sees_discussions_spec.rb +++ b/spec/features/merge_request/user_sees_discussions_spec.rb @@ -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.