summaryrefslogtreecommitdiff
path: root/app/controllers
diff options
context:
space:
mode:
authorSean McGivern <sean@mcgivern.me.uk>2018-10-05 17:40:57 +0000
committerSean McGivern <sean@mcgivern.me.uk>2018-10-05 17:40:57 +0000
commit58a256ad0bfa10211479b2685ed2d5e19948e059 (patch)
tree7078c2506e50829e1c85d43bc71deae907c29b57 /app/controllers
parentb407061a281607e0c4bf22d2b7e94a068768ccac (diff)
parent0ae48e068794a732f728de76ffbf3f95e702ba9a (diff)
downloadgitlab-ce-58a256ad0bfa10211479b2685ed2d5e19948e059.tar.gz
Merge branch 'issue_43097' into 'master'
Move related branches to service Closes #43097 See merge request gitlab-org/gitlab-ce!22094
Diffstat (limited to 'app/controllers')
-rw-r--r--app/controllers/projects/issues_controller.rb2
1 files changed, 1 insertions, 1 deletions
diff --git a/app/controllers/projects/issues_controller.rb b/app/controllers/projects/issues_controller.rb
index 4e859de6fde..b06a6f3bb0d 100644
--- a/app/controllers/projects/issues_controller.rb
+++ b/app/controllers/projects/issues_controller.rb
@@ -127,7 +127,7 @@ class Projects::IssuesController < Projects::ApplicationController
end
def related_branches
- @related_branches = @issue.related_branches(current_user)
+ @related_branches = Issues::RelatedBranchesService.new(project, current_user).execute(issue)
respond_to do |format|
format.json do