diff options
| author | Mike Greiling <mike@pixelcog.com> | 2019-01-24 21:54:04 +0000 |
|---|---|---|
| committer | Mike Greiling <mike@pixelcog.com> | 2019-01-24 21:54:04 +0000 |
| commit | d6239b88b25e64aefaee0b272f082f24c5a97881 (patch) | |
| tree | c13d6c699e8eafb157bc3d40772abb32383278e2 /app/helpers/notes_helper.rb | |
| parent | 99e363debddbc75e1bc401dcecd41ea748b001e0 (diff) | |
| parent | a8dcc181da5fdd564360cd6291522e89488def3e (diff) | |
| download | gitlab-ce-d6239b88b25e64aefaee0b272f082f24c5a97881.tar.gz | |
Merge branch '53950-commit-comments-displayed-on-a-merge-request' into 'master'56221-spec-features-projects-clusters-gcp_spec-rb-appears-to-be-making-real-google-api-requests
Resolve "Commit comments displayed on a merge request that contains that commit no longer specify which commit they come from"
Closes #53950
See merge request gitlab-org/gitlab-ce!24427
Diffstat (limited to 'app/helpers/notes_helper.rb')
| -rw-r--r-- | app/helpers/notes_helper.rb | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/app/helpers/notes_helper.rb b/app/helpers/notes_helper.rb index 033686823a2..293dd20ad49 100644 --- a/app/helpers/notes_helper.rb +++ b/app/helpers/notes_helper.rb @@ -85,7 +85,7 @@ module NotesHelper diffs_project_merge_request_path(discussion.project, discussion.noteable, path_params) elsif discussion.for_commit? - anchor = discussion.line_code if discussion.diff_discussion? + anchor = discussion.diff_discussion? ? discussion.line_code : "note_#{discussion.first_note.id}" project_commit_path(discussion.project, discussion.noteable, anchor: anchor) end |