diff options
| author | Stan Hu <stanhu@gmail.com> | 2015-08-14 04:23:48 +0300 |
|---|---|---|
| committer | Stan Hu <stanhu@gmail.com> | 2015-08-14 17:09:25 +0300 |
| commit | 6e808fc222dde420749fcf9ed006cfb6983e4b70 (patch) | |
| tree | 8cb7d8bd2b18853d34ac002d815b3e6d6f1e32ea /lib | |
| parent | f6f58cfb1fd7bc7fcef5e9b1f2ce658a15047b1d (diff) | |
Clear cache to prevent listing deleted branches after MR removes source branch
Closes #2272
Diffstat (limited to 'lib')
| -rw-r--r-- | lib/gitlab/satellite/merge_action.rb | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/lib/gitlab/satellite/merge_action.rb b/lib/gitlab/satellite/merge_action.rb index f9bf286697e..52e8130956c 100644 --- a/lib/gitlab/satellite/merge_action.rb +++ b/lib/gitlab/satellite/merge_action.rb @@ -36,6 +36,7 @@ module Gitlab if merge_request.remove_source_branch? # will raise CommandFailed when push fails merge_repo.git.push(default_options, :origin, ":#{merge_request.source_branch}") + merge_request.source_project.repository.expire_branch_names end # merge, push and branch removal successful true |