diff notes created in merge request on a commit have the right context

add a spec for commit merge request diff notes

1 files changed, 24 insertions, 0 deletions

diff --git a/app/helpers/merge_requests_helper.rb b/app/helpers/merge_requests_helper.rb
index 5b2c58d193d..004aaeb2c56 100644
--- a/app/helpers/merge_requests_helper.rb
+++ b/app/helpers/merge_requests_helper.rb
@@ -101,6 +101,30 @@ module MergeRequestsHelper
     }.merge(merge_params_ee(merge_request))
   end
 
+  def tab_link_for(tab, options={}, &block)
+    data_attrs = {
+      action: tab.to_s,
+      target: "##{tab.to_s}",
+      toggle: options.fetch(:force_link, false) ? '' : 'tab'
+    }
+
+    url = case tab
+    when :show
+      data_attrs.merge!(target: '#notes')
+      project_merge_request_path(@project, @merge_request)
+    when :commits
+      commits_project_merge_request_path(@project, @merge_request)
+    when :pipelines
+      pipelines_project_merge_request_path(@project, @merge_request)
+    when :diffs
+      diffs_project_merge_request_path(@project, @merge_request)
+    else
+      raise "Cannot create tab #{tab}."
+    end
+
+    link_to(url, data: data_attrs, &block)
+  end
+
   def merge_params_ee(merge_request)
     {}
   end