diff options
| author | Rémy Coutable <remy@rymai.me> | 2017-02-17 19:37:36 +0000 |
|---|---|---|
| committer | Rémy Coutable <remy@rymai.me> | 2017-02-17 19:37:36 +0000 |
| commit | 63cb6c843fd6b7f99042049c31643bbeceef4a95 (patch) | |
| tree | 7fa05f8a8beca59bd82fbf7f17c26a2dbedd9d0f | |
| parent | 1fd90ef553340317b69d7acd25dc957831d98f1f (diff) | |
| parent | 40d26e25543cf91d07a64428d9ea6b410d01fa7f (diff) | |
| download | gitlab-ce-63cb6c843fd6b7f99042049c31643bbeceef4a95.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 |