diff options
| author | Phil Hughes <me@iamphill.com> | 2017-07-24 14:36:31 +0100 |
|---|---|---|
| committer | Phil Hughes <me@iamphill.com> | 2017-07-24 14:36:31 +0100 |
| commit | 4d2be5bbec25d60a8d478bda5bc83159f2c845b1 (patch) | |
| tree | c3c28a833ccd2a6628d928acee44e62ccfcc6fd8 /app/services/merge_requests/post_merge_service.rb | |
| parent | 1a2d180e3dfd8bdad94766a2e8b1195288c2b146 (diff) | |
| parent | d4c4dec80dc3abd39116440a3c291c19b27258e1 (diff) | |
| download | gitlab-ce-4d2be5bbec25d60a8d478bda5bc83159f2c845b1.tar.gz | |
Merge branch 'master' into sidebar-fly-out-sub-nav
Diffstat (limited to 'app/services/merge_requests/post_merge_service.rb')
| -rw-r--r-- | app/services/merge_requests/post_merge_service.rb | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/app/services/merge_requests/post_merge_service.rb b/app/services/merge_requests/post_merge_service.rb index f0d998731d7..261a8bfa200 100644 --- a/app/services/merge_requests/post_merge_service.rb +++ b/app/services/merge_requests/post_merge_service.rb @@ -13,7 +13,7 @@ module MergeRequests create_note(merge_request) notification_service.merge_mr(merge_request, current_user) execute_hooks(merge_request, 'merge') - invalidate_cache_counts(merge_request.assignees, merge_request) + invalidate_cache_counts(merge_request, users: merge_request.assignees) end private |