add support for the commit reference filter

7 files changed, 26 insertions, 38 deletions

diff --git a/app/assets/javascripts/diff_notes/diff_notes_bundle.js b/app/assets/javascripts/diff_notes/diff_notes_bundle.js
index 2f22361d6d2..e0422057090 100644
--- a/app/assets/javascripts/diff_notes/diff_notes_bundle.js
+++ b/app/assets/javascripts/diff_notes/diff_notes_bundle.js
@@ -16,7 +16,7 @@ import './components/diff_note_avatars';
 import './components/new_issue_for_discussion';
 
 $(() => {
-  const projectPathHolder = document.querySelector('.merge-request') || document.querySelector('.commit-box')
+  const projectPathHolder = document.querySelector('.merge-request') || document.querySelector('.commit-box');
   const projectPath = projectPathHolder.dataset.projectPath;
   const COMPONENT_SELECTOR = 'resolve-btn, resolve-discussion-btn, jump-to-discussion, comment-and-resolve-btn, new-issue-for-discussion-btn';
 
diff --git a/app/controllers/concerns/renders_notes.rb b/app/controllers/concerns/renders_notes.rb
index a35313c917c..824ad06465c 100644
--- a/app/controllers/concerns/renders_notes.rb
+++ b/app/controllers/concerns/renders_notes.rb
@@ -3,7 +3,7 @@ module RendersNotes
     preload_noteable_for_regular_notes(notes)
     preload_max_access_for_authors(notes, @project)
     preload_first_time_contribution_for_authors(noteable, notes)
-    Notes::RenderService.new(current_user).execute(notes, @project, noteable_context(noteable))
+    Notes::RenderService.new(current_user).execute(notes, @project)
 
     notes
   end
@@ -26,13 +26,4 @@ module RendersNotes
 
     notes.each {|n| n.specialize_for_first_contribution!(noteable)}
   end
-
-  def noteable_context(noteable)
-    case noteable
-    when MergeRequest
-      { merge_request: noteable }
-    else
-      {}
-    end
-  end
 end
diff --git a/app/controllers/projects/merge_requests/diffs_controller.rb b/app/controllers/projects/merge_requests/diffs_controller.rb
index 07bf9db5a34..fe8525a488c 100644
--- a/app/controllers/projects/merge_requests/diffs_controller.rb
+++ b/app/controllers/projects/merge_requests/diffs_controller.rb
@@ -21,8 +21,7 @@ class Projects::MergeRequests::DiffsController < Projects::MergeRequests::Applic
   private
 
   def define_diff_vars
-    @merge_request_diffs = @merge_request.merge_request_diffs.viewable.select_without_diff.order_id_desc
-
+    @merge_request_diffs = @merge_request.merge_request_diffs.viewable.order_id_desc
     @compare = commit || find_merge_request_diff_compare
     return render_404 unless @compare
 
@@ -31,7 +30,7 @@ class Projects::MergeRequests::DiffsController < Projects::MergeRequests::Applic
 
   def commit
     return nil unless commit_id = params[:commit_id].presence
-    return nil unless @merge_request.all_commit_shas.include?(commit_id)
+    return nil unless @merge_request.all_commits.exists?(sha: commit_id)
 
     @commit ||= @project.commit(commit_id)
   end
diff --git a/app/models/commit.rb b/app/models/commit.rb
index 6b28d290f99..307e4fcedfe 100644
--- a/app/models/commit.rb
+++ b/app/models/commit.rb
@@ -1,3 +1,4 @@
+# coding: utf-8
 class Commit
   extend ActiveModel::Naming
   extend Gitlab::Cache::RequestCache
@@ -25,7 +26,7 @@ class Commit
   DIFF_HARD_LIMIT_FILES = 1000
   DIFF_HARD_LIMIT_LINES = 50000
 
-  MIN_SHA_LENGTH = 7
+  MIN_SHA_LENGTH = Gitlab::Git::Commit::MIN_SHA_LENGTH
   COMMIT_SHA_PATTERN = /\h{#{MIN_SHA_LENGTH},40}/.freeze
 
   def banzai_render_context(field)
diff --git a/app/models/merge_request.rb b/app/models/merge_request.rb
index 949d42f865c..22a79da9879 100644
--- a/app/models/merge_request.rb
+++ b/app/models/merge_request.rb
@@ -649,6 +649,7 @@ class MergeRequest < ActiveRecord::Base
       .to_sql
 
     Note.from("(#{union}) #{Note.table_name}")
+      .includes(:noteable)
   end
 
   alias_method :discussion_notes, :related_notes
@@ -920,16 +921,13 @@ class MergeRequest < ActiveRecord::Base
   def all_pipelines
     return Ci::Pipeline.none unless source_project
 
+    commit_shas = all_commits.unscope(:limit).select(:sha)
     @all_pipelines ||= source_project.pipelines
-      .where(sha: all_commit_shas, ref: source_branch)
+      .where(sha: commit_shas, ref: source_branch)
       .order(id: :desc)
   end
 
-  # Note that this could also return SHA from now dangling commits
-  #
-  def all_commit_shas
-    return commit_shas unless persisted?
-
+  def all_commits
     diffs_relation = merge_request_diffs
 
     # MySQL doesn't support LIMIT in a subquery.
@@ -938,8 +936,15 @@ class MergeRequest < ActiveRecord::Base
     MergeRequestDiffCommit
       .where(merge_request_diff: diffs_relation)
       .limit(10_000)
-      .pluck('sha')
-      .uniq
+  end
+
+  # Note that this could also return SHA from now dangling commits
+  #
+  def all_commit_shas
+    @all_commit_shas ||= begin
+      return commit_shas unless persisted?
+      all_commits.pluck(:sha).uniq
+    end
   end
 
   def merge_commit
diff --git a/app/services/system_note_service.rb b/app/services/system_note_service.rb
index 5f8a1bf07e2..30a5aab13bf 100644
--- a/app/services/system_note_service.rb
+++ b/app/services/system_note_service.rb
@@ -23,7 +23,7 @@ module SystemNoteService
 
     body = "added #{commits_text}\n\n"
     body << existing_commit_summary(noteable, existing_commits, oldrev)
-    body << new_commit_summary(noteable, new_commits).join("\n")
+    body << new_commit_summary(new_commits).join("\n")
     body << "\n\n[Compare with previous version](#{diff_comparison_url(noteable, project, oldrev)})"
 
     create_note(NoteSummary.new(noteable, project, author, body, action: 'commit', commit_count: total_count))
@@ -486,9 +486,9 @@ module SystemNoteService
   # new_commits - Array of new Commit objects
   #
   # Returns an Array of Strings
-  def new_commit_summary(merge_request, new_commits)
+  def new_commit_summary(new_commits)
     new_commits.collect do |commit|
-      "* [#{commit.short_id}](#{merge_request_commit_url(merge_request, commit)}) - #{escape_html(commit.title)}"
+      "* #{commit.short_id} - #{escape_html(commit.title)}"
     end
   end
 
@@ -668,12 +668,4 @@ module SystemNoteService
       start_sha: oldrev
     )
   end
-
-  def merge_request_commit_url(merge_request, commit)
-    url_helpers.diffs_project_merge_request_url(
-      merge_request.target_project,
-      merge_request,
-      commit_id: commit
-    )
-  end
 end
diff --git a/app/views/projects/merge_requests/diffs/_not_all_comments_displayed.html.haml b/app/views/projects/merge_requests/diffs/_not_all_comments_displayed.html.haml
index e4a1dc786b9..faabba5fc35 100644
--- a/app/views/projects/merge_requests/diffs/_not_all_comments_displayed.html.haml
+++ b/app/views/projects/merge_requests/diffs/_not_all_comments_displayed.html.haml
@@ -11,7 +11,7 @@
             comparing two versions of the diff
           - else
             viewing an old version of the diff
-        .pull-right
-          = link_to diffs_project_merge_request_path(@project, @merge_request), class: 'btn btn-sm' do
-            Show latest version
-            = "of the diff" if @commit
+      .pull-right
+        = link_to diffs_project_merge_request_path(@project, @merge_request), class: 'btn btn-sm' do
+          Show latest version
+          = "of the diff" if @commit