diff options
| author | Bob Van Landuyt <bob@gitlab.com> | 2017-03-09 11:38:53 +0100 |
|---|---|---|
| committer | Bob Van Landuyt <bob@gitlab.com> | 2017-03-13 08:27:51 +0100 |
| commit | 67bd277ae6e7246543b2aeaf83a9c39412e18d05 (patch) | |
| tree | e2e18350329f3ea93b62b97acf59f210f68aa12b /app/services/issues | |
| parent | 5681104925be658aad97ea37896428d9618f772f (diff) | |
| download | gitlab-ce-67bd277ae6e7246543b2aeaf83a9c39412e18d05.tar.gz | |
Make sure the for a merge request only gets executed once.
Diffstat (limited to 'app/services/issues')
| -rw-r--r-- | app/services/issues/resolve_discussions.rb | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/app/services/issues/resolve_discussions.rb b/app/services/issues/resolve_discussions.rb index 47fd334a9b2..89105dceb5f 100644 --- a/app/services/issues/resolve_discussions.rb +++ b/app/services/issues/resolve_discussions.rb @@ -8,7 +8,9 @@ module Issues end def merge_request_for_resolving_discussions - @merge_request_for_resolving_discussions ||= MergeRequestsFinder.new(current_user, project_id: project.id). + return @merge_request_for_resolving_discussions if defined?(@merge_request_for_resolving_discussions) + + @merge_request_for_resolving_discussions = MergeRequestsFinder.new(current_user, project_id: project.id). execute. find_by(iid: merge_request_for_resolving_discussions_iid) end |