diff options
| author | Douwe Maan <douwe@selenight.nl> | 2017-08-17 14:01:31 +0200 |
|---|---|---|
| committer | Douwe Maan <douwe@selenight.nl> | 2017-08-17 14:01:31 +0200 |
| commit | 834f1b30d50dc3ad9d0f6ff81cef24dc6ebc375c (patch) | |
| tree | e5f2e714e695d995649942111f29d4e857b33a67 /app/controllers/projects/issues_controller.rb | |
| parent | 6aeb99c98bee304c5010a1173c47777eff1e04a5 (diff) | |
| parent | fe0ffcc78941bf9de98e3698e743c3cbb9846b6a (diff) | |
| download | gitlab-ce-834f1b30d50dc3ad9d0f6ff81cef24dc6ebc375c.tar.gz | |
Merge branch 'master' into issue-discussions-refactor
# Conflicts:
# package.json
# spec/support/features/reportable_note_shared_examples.rb
Diffstat (limited to 'app/controllers/projects/issues_controller.rb')
| -rw-r--r-- | app/controllers/projects/issues_controller.rb | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/app/controllers/projects/issues_controller.rb b/app/controllers/projects/issues_controller.rb index bfcd48695f7..dfde6a23c07 100644 --- a/app/controllers/projects/issues_controller.rb +++ b/app/controllers/projects/issues_controller.rb @@ -220,7 +220,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]) |