diff options
| author | Stan Hu <stanhu@gmail.com> | 2015-08-18 06:46:44 -0700 |
|---|---|---|
| committer | Stan Hu <stanhu@gmail.com> | 2015-08-18 06:46:44 -0700 |
| commit | 2b127c3fd2be567ddd11460f54ef31525602f553 (patch) | |
| tree | acc92ce9598646e3268bd76d96fdb962222e054e /lib | |
| parent | cc871c0c74a7babacdc325cfe8080c177cb50d78 (diff) | |
| parent | 798f2fe19f4fb90a99d77f3d77011cdba5a73046 (diff) | |
| download | gitlab-ce-2b127c3fd2be567ddd11460f54ef31525602f553.tar.gz | |
Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ce
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 |