summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLin Jen-Shin <godfat@godfat.org>2017-08-10 22:19:55 +0800
committerLin Jen-Shin <godfat@godfat.org>2017-08-10 22:19:55 +0800
commit64e13d1958eac06185866e050ef83678ed2c4fd9 (patch)
treeeda18ae783f1c42cc6176c157935b8abc6931972
parent023d6749c24741dd1ac065b7c9d4413acb9aa320 (diff)
downloadgitlab-ce-64e13d1958eac06185866e050ef83678ed2c4fd9.tar.gz
Avoid ambiguity, which happened in a single test run
-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 e2ccabb22db..917ee3955e2 100644
--- a/app/controllers/projects/issues_controller.rb
+++ b/app/controllers/projects/issues_controller.rb
@@ -212,7 +212,7 @@ class Projects::IssuesController < Projects::ApplicationController
end
def create_merge_request
- result = MergeRequests::CreateFromIssueService.new(project, current_user, issue_iid: issue.iid).execute
+ result = ::MergeRequests::CreateFromIssueService.new(project, current_user, issue_iid: issue.iid).execute
if result[:status] == :success
render json: MergeRequestCreateSerializer.new.represent(result[:merge_request])