Download as
Browse Code »

Commit 3080127354a2c92fd3ceecc05fe93e091e3b5eec

Authored by Riyad Preukschas
1 parent 0ebcc60a
Exists in master and in 4 other branches 6-8-stable, 7-0-stable, 7-0-stable-spb, spb-stable

Fix timeouts in MergeAction

Showing 1 changed file with 4 additions and 4 deletions   Show diff stats
lib/gitlab/satellite/merge_action.rb
  Diff comments   View file @3080127
... ... @@ -26,12 +26,12 @@ module Gitlab
26 26 if merge_in_satellite!(merge_repo)
27 27 # push merge back to Gitolite
28 28 # will raise CommandFailed when push fails
29   - merge_repo.git.push({raise: true}, :origin, merge_request.target_branch)
  29 + merge_repo.git.push({raise: true, timeout: true}, :origin, merge_request.target_branch)
30 30  
31 31 # remove source branch
32 32 if merge_request.should_remove_source_branch && !project.root_ref?(merge_request.source_branch)
33 33 # will raise CommandFailed when push fails
34   - merge_repo.git.push({raise: true}, :origin, ":#{merge_request.source_branch}")
  34 + merge_repo.git.push({raise: true, timeout: true}, :origin, ":#{merge_request.source_branch}")
35 35 end
36 36  
37 37 # merge, push and branch removal successful
... ... @@ -55,11 +55,11 @@ module Gitlab
55 55 prepare_satellite!(repo)
56 56  
57 57 # create target branch in satellite at the corresponding commit from Gitolite
58   - repo.git.checkout({raise: true, b: true}, merge_request.target_branch, "origin/#{merge_request.target_branch}")
  58 + repo.git.checkout({raise: true, timeout: true, b: true}, merge_request.target_branch, "origin/#{merge_request.target_branch}")
59 59  
60 60 # merge the source branch from Gitolite into the satellite
61 61 # will raise CommandFailed when merge fails
62   - repo.git.pull({raise: true, no_ff: true}, :origin, merge_request.source_branch)
  62 + repo.git.pull({raise: true, timeout: true, no_ff: true}, :origin, merge_request.source_branch)
63 63 rescue Grit::Git::CommandFailed => ex
64 64 Gitlab::GitLogger.error(ex.message)
65 65 false
... ...