diff options
| author | Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> | 2015-08-18 13:16:46 +0000 |
|---|---|---|
| committer | Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> | 2015-08-18 13:16:46 +0000 |
| commit | 798f2fe19f4fb90a99d77f3d77011cdba5a73046 (patch) | |
| tree | 5e855c4b52322ed250a7f658f4e2e0379dbb5194 /lib | |
| parent | 2a704396fb434c56a1ca2c41d65fd22a8b9a6d9c (diff) | |
| parent | 6e808fc222dde420749fcf9ed006cfb6983e4b70 (diff) | |
| download | gitlab-ce-798f2fe19f4fb90a99d77f3d77011cdba5a73046.tar.gz | |
Merge branch 'mr-source-branch-clear-cache' into 'master'
Clear cache to prevent listing deleted branches after MR removes source branch
Closes #2272
See merge request !1160
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 |