diff options
author | Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> | 2015-08-04 16:33:53 +0200 |
---|---|---|
committer | Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> | 2015-08-04 16:33:53 +0200 |
commit | c17f5d06aa4a55a8446928ea6b690ae8e09ce237 (patch) | |
tree | c4377d4b368172cb0c08f337e2bad81adbad7da5 /lib | |
parent | 66bdbdb35d5930bb458ddf381c45f80548aa7235 (diff) | |
download | gitlab-ce-c17f5d06aa4a55a8446928ea6b690ae8e09ce237.tar.gz |
Fix merge api and spec
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
Diffstat (limited to 'lib')
-rw-r--r-- | lib/api/merge_requests.rb | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/lib/api/merge_requests.rb b/lib/api/merge_requests.rb index a956c960a2e..e8b49fb7cba 100644 --- a/lib/api/merge_requests.rb +++ b/lib/api/merge_requests.rb @@ -200,7 +200,7 @@ module API if merge_request.can_be_merged? commit_message = params[:merge_commit_message] || merge_request.merge_commit_message - MergeRequests::MergeService.new(merge_request.target_project, current_user). + ::MergeRequests::MergeService.new(merge_request.target_project, current_user). execute(merge_request, commit_message) present merge_request, with: Entities::MergeRequest |