summaryrefslogtreecommitdiff
path: root/app/models/merge_request_diff.rb
diff options
context:
space:
mode:
authorSimon Knox <psimyn@gmail.com>2018-01-15 14:59:11 +1100
committerSimon Knox <psimyn@gmail.com>2018-01-15 14:59:11 +1100
commit2a341eb03fc7d2ece4a9fd95ec63995efa30b219 (patch)
treeb2cf7d6a6eb13c56bc59819cd7927196bbc6d93c /app/models/merge_request_diff.rb
parent564cdddb5f4c8a690a937b61dba2e0427c3eb565 (diff)
parent74f2f9b30fb1972a26481072486b358eb943309f (diff)
downloadgitlab-ce-2a341eb03fc7d2ece4a9fd95ec63995efa30b219.tar.gz
Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ce into dispatcher-projects-c
Diffstat (limited to 'app/models/merge_request_diff.rb')
-rw-r--r--app/models/merge_request_diff.rb3
1 files changed, 3 insertions, 0 deletions
diff --git a/app/models/merge_request_diff.rb b/app/models/merge_request_diff.rb
index afab72930c1..69a846da9be 100644
--- a/app/models/merge_request_diff.rb
+++ b/app/models/merge_request_diff.rb
@@ -28,6 +28,9 @@ class MergeRequestDiff < ActiveRecord::Base
end
scope :viewable, -> { without_state(:empty) }
+ scope :by_commit_sha, ->(sha) do
+ joins(:merge_request_diff_commits).where(merge_request_diff_commits: { sha: sha }).reorder(nil)
+ end
scope :recent, -> { order(id: :desc).limit(100) }