diff options
| author | Rémy Coutable <remy@rymai.me> | 2017-02-17 19:37:36 +0000 |
|---|---|---|
| committer | Felipe Artur <felipefac@gmail.com> | 2017-02-20 10:58:25 -0300 |
| commit | f780eddc0821e90e5a9a250c33b3aedf7fb60ffb (patch) | |
| tree | 13c6c6945c0695fe487ac0569a9ffeea55ebeacf | |
| parent | 05ad6c3228d7ac676c069aaeedcf53ded39ad22e (diff) | |
| download | gitlab-ce-f780eddc0821e90e5a9a250c33b3aedf7fb60ffb.tar.gz | |
Merge branch 'fix-merge-service-with-no-source' into 'master'
Fix merge service error with no source
See merge request !9348
| -rw-r--r-- | app/services/merge_requests/merge_service.rb | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/app/services/merge_requests/merge_service.rb b/app/services/merge_requests/merge_service.rb index 177b714b734..3da1b657a41 100644 --- a/app/services/merge_requests/merge_service.rb +++ b/app/services/merge_requests/merge_service.rb @@ -18,7 +18,7 @@ module MergeRequests @source = find_merge_source unless @source - log_merge_error('No source for merge', save_message_on_model: true) + return log_merge_error('No source for merge', save_message_on_model: true) end merge_request.in_locked_state do |