diff options
| author | Sean McGivern <sean@mcgivern.me.uk> | 2017-08-09 14:54:03 +0300 |
|---|---|---|
| committer | Sean McGivern <sean@mcgivern.me.uk> | 2017-08-09 14:54:03 +0300 |
| commit | 22c02bc22aff28150d6f8acb9b789ca25fc2ed11 (patch) | |
| tree | b58f7ad0f89b721ea524f8131a0b8e33db4136f6 /app/services | |
| parent | 97b2c7c6333e2ec889874a670996bd0d0866bf51 (diff) | |
| parent | 947c09c2a6f8cc9c4b3606efb326aa4912095e7d (diff) | |
Merge branch '36119-issuable-workers' into 'master'
Simplify checking if objects exist code in new issaubles workers
Closes #36119
See merge request !13365
Diffstat (limited to 'app/services')
| -rw-r--r-- | app/services/issues/create_service.rb | 1 | ||||
| -rw-r--r-- | app/services/merge_requests/create_service.rb | 1 |
2 files changed, 2 insertions, 0 deletions
diff --git a/app/services/issues/create_service.rb b/app/services/issues/create_service.rb index 9114f0ccc81..234fcbede03 100644 --- a/app/services/issues/create_service.rb +++ b/app/services/issues/create_service.rb @@ -16,6 +16,7 @@ module Issues spam_check(issue, current_user) issue.move_to_end + # current_user (defined in BaseService) is not available within run_after_commit block user = current_user issue.run_after_commit do NewIssueWorker.perform_async(issue.id, user.id) diff --git a/app/services/merge_requests/create_service.rb b/app/services/merge_requests/create_service.rb index 7d539fa49e6..fa0c0b7175c 100644 --- a/app/services/merge_requests/create_service.rb +++ b/app/services/merge_requests/create_service.rb @@ -17,6 +17,7 @@ module MergeRequests end def before_create(merge_request) + # current_user (defined in BaseService) is not available within run_after_commit block user = current_user merge_request.run_after_commit do NewMergeRequestWorker.perform_async(merge_request.id, user.id) |