diff options
author | Ash McKenzie <amckenzie@gitlab.com> | 2019-04-30 00:34:49 +0000 |
---|---|---|
committer | Ash McKenzie <amckenzie@gitlab.com> | 2019-04-30 00:34:49 +0000 |
commit | 5d5b9d57de9b781c5cc4ecdfb86a3d735ba52c7a (patch) | |
tree | fdb7050cb3e15aab8e8f1c2d23862b051dd9f72f /app/controllers/projects/issues_controller.rb | |
parent | 7ae2107d9ebca0adecc8a21cacd1bfb6e89ee3ab (diff) | |
parent | cf0265723479b2e511595312f8d053f737fa3d57 (diff) | |
download | gitlab-ce-5d5b9d57de9b781c5cc4ecdfb86a3d735ba52c7a.tar.gz |
Merge branch '60476-actionview-missingtemplate-missing-template-projects-issues-_merge_requests-with-locale-en-formats-html-varian' into 'master'
Delete leftover code for referenced_merge_requests endpoint
Closes #60476
See merge request gitlab-org/gitlab-ce!27335
Diffstat (limited to 'app/controllers/projects/issues_controller.rb')
-rw-r--r-- | app/controllers/projects/issues_controller.rb | 12 |
1 files changed, 0 insertions, 12 deletions
diff --git a/app/controllers/projects/issues_controller.rb b/app/controllers/projects/issues_controller.rb index 2ef5c207d67..b4d89db20c5 100644 --- a/app/controllers/projects/issues_controller.rb +++ b/app/controllers/projects/issues_controller.rb @@ -132,18 +132,6 @@ class Projects::IssuesController < Projects::ApplicationController render_conflict_response end - def referenced_merge_requests - @merge_requests, @closed_by_merge_requests = ::Issues::ReferencedMergeRequestsService.new(project, current_user).execute(issue) - - respond_to do |format| - format.json do - render json: { - html: view_to_html_string('projects/issues/_merge_requests') - } - end - end - end - def related_branches @related_branches = Issues::RelatedBranchesService.new(project, current_user).execute(issue) |