diff options
| author | Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> | 2013-03-18 03:39:51 -0700 |
|---|---|---|
| committer | Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> | 2013-03-18 03:39:51 -0700 |
| commit | 351390239673923d71610ba320b2bf163ab6f9a9 (patch) | |
| tree | 9d03e0e566c6a67e9dcf44a172d72cfeccb92024 /lib | |
| parent | d8ad01bb6e18a150d53a4b4d2767cb0e0ca675a0 (diff) | |
| parent | 77295b00b8833bebdaa4e846337fa78101573095 (diff) | |
| download | gitlab-ce-351390239673923d71610ba320b2bf163ab6f9a9.tar.gz | |
Merge pull request #3242 from murank/fix_failure_of_checking_merge_requests
Fix failure of cheking a merge request after conflict.
Diffstat (limited to 'lib')
| -rw-r--r-- | lib/gitlab/satellite/satellite.rb | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/lib/gitlab/satellite/satellite.rb b/lib/gitlab/satellite/satellite.rb index e7f7a7673b5..668de75f663 100644 --- a/lib/gitlab/satellite/satellite.rb +++ b/lib/gitlab/satellite/satellite.rb @@ -24,8 +24,8 @@ module Gitlab def clear_and_update! raise_no_satellite unless exists? - delete_heads! clear_working_dir! + delete_heads! update_from_source! end |