diff options
| author | Simon Knox <psimyn@gmail.com> | 2018-02-14 04:37:29 +0300 |
|---|---|---|
| committer | Simon Knox <psimyn@gmail.com> | 2018-02-14 04:37:29 +0300 |
| commit | f9bd9fcb17d84fda134501467bababb4d704495c (patch) | |
| tree | 91e9c000d36d5c2606f40209f7d2ff47b07a923c /app/controllers/projects | |
| parent | 230c140ffbea031cc57d347f7f3bdac9a488db90 (diff) | |
| parent | 91002b129a6e8644c288bd3174eae8942285ca81 (diff) | |
Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ce into acet-mr-notes-index
Diffstat (limited to 'app/controllers/projects')
| -rw-r--r-- | app/controllers/projects/issues_controller.rb | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/app/controllers/projects/issues_controller.rb b/app/controllers/projects/issues_controller.rb index 354612c0428..23d5c5b4207 100644 --- a/app/controllers/projects/issues_controller.rb +++ b/app/controllers/projects/issues_controller.rb @@ -108,8 +108,7 @@ class Projects::IssuesController < Projects::ApplicationController end def referenced_merge_requests - @merge_requests = @issue.referenced_merge_requests(current_user) - @closed_by_merge_requests = @issue.closed_by_merge_requests(current_user) + @merge_requests, @closed_by_merge_requests = ::Issues::FetchReferencedMergeRequestsService.new(project, current_user).execute(issue) respond_to do |format| format.json do |