diff options
| author | Patrick Bajao <ebajao@gitlab.com> | 2019-01-25 17:22:48 +0800 |
|---|---|---|
| committer | Patrick Bajao <ebajao@gitlab.com> | 2019-01-28 15:11:38 +0800 |
| commit | 65723a2cb60f46681a766f34102df700ef5b7573 (patch) | |
| tree | 26007e09b6dacf3232ba6b09b5d7547f34e4b0b6 /app/controllers/projects/commit_controller.rb | |
| parent | 276147c1f6c54ae87941953ec62d0d674c12f462 (diff) | |
| download | gitlab-ce-65723a2cb60f46681a766f34102df700ef5b7573.tar.gz | |
Modify MergeRequestsFinder to allow filtering by commit
Diffstat (limited to 'app/controllers/projects/commit_controller.rb')
| -rw-r--r-- | app/controllers/projects/commit_controller.rb | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/app/controllers/projects/commit_controller.rb b/app/controllers/projects/commit_controller.rb index 32fc5140366..fbad56cf6b3 100644 --- a/app/controllers/projects/commit_controller.rb +++ b/app/controllers/projects/commit_controller.rb @@ -65,7 +65,11 @@ class Projects::CommitController < Projects::ApplicationController # rubocop: enable CodeReuse/ActiveRecord def merge_requests - @merge_requests = @commit.merge_requests.map do |mr| + @merge_requests = MergeRequestsFinder.new( + current_user, + project_id: @project.id, + commit_sha: @commit.sha + ).execute.map do |mr| { iid: mr.iid, path: merge_request_path(mr), title: mr.title } end |