From 6e808fc222dde420749fcf9ed006cfb6983e4b70 Mon Sep 17 00:00:00 2001 From: Stan Hu Date: Thu, 13 Aug 2015 18:23:48 -0700 Subject: Clear cache to prevent listing deleted branches after MR removes source branch Closes #2272 --- lib/gitlab/satellite/merge_action.rb | 1 + 1 file changed, 1 insertion(+) (limited to 'lib') 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 -- cgit v1.2.1