diff options
| author | Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> | 2014-03-25 14:01:52 +0200 |
|---|---|---|
| committer | Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> | 2014-03-25 14:01:52 +0200 |
| commit | f08464c055420f9091512a3f9ec1dc2de960fbde (patch) | |
| tree | 3cecab42f5fbdb72cf93b102009d00e24565f241 /app/services/merge_requests/merge_service.rb | |
| parent | 80daf9a7774fd757a8838f0b49b6384ec7ceb724 (diff) | |
| download | gitlab-ce-f08464c055420f9091512a3f9ec1dc2de960fbde.tar.gz | |
Remove author_id_of_changes from app
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
Diffstat (limited to 'app/services/merge_requests/merge_service.rb')
| -rw-r--r-- | app/services/merge_requests/merge_service.rb | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/app/services/merge_requests/merge_service.rb b/app/services/merge_requests/merge_service.rb index 80487f661e0..680766140bd 100644 --- a/app/services/merge_requests/merge_service.rb +++ b/app/services/merge_requests/merge_service.rb @@ -7,11 +7,10 @@ module MergeRequests # to target branch class MergeService < BaseMergeService def execute(merge_request, current_user, commit_message) - merge_request.author_id_of_changes = current_user.id merge_request.merge notification.merge_mr(merge_request, current_user) - create_merge_event(merge_request) + create_merge_event(merge_request, current_user) execute_project_hooks(merge_request) true |