diff options
| author | Rubén Dávila <rdavila84@gmail.com> | 2016-04-01 14:21:08 -0500 |
|---|---|---|
| committer | Rubén Dávila <rdavila84@gmail.com> | 2016-04-01 14:21:08 -0500 |
| commit | e6b5716785a31396c2aa8b044a087e8b2ca5fac3 (patch) | |
| tree | d7a7621e5a95c7863af7b659ad9047e3477b00e4 /spec/workers | |
| parent | 09b7b766cbf42ed6e9e9246d494b60f05a7a28e7 (diff) | |
| download | gitlab-ce-e6b5716785a31396c2aa8b044a087e8b2ca5fac3.tar.gz | |
Migrate Repository#local_branches from gitlab-ee.update_repository_from_ee
This will help us to avoid posible merge conflicts when merging
gitlab-ce to gitlab-ee
Diffstat (limited to 'spec/workers')
| -rw-r--r-- | spec/workers/merge_worker_spec.rb | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/spec/workers/merge_worker_spec.rb b/spec/workers/merge_worker_spec.rb index b11c5de94e3..1abd87d7d33 100644 --- a/spec/workers/merge_worker_spec.rb +++ b/spec/workers/merge_worker_spec.rb @@ -22,6 +22,8 @@ describe MergeWorker do merge_request.reload expect(merge_request).to be_merged + + source_project.repository.expire_branches_cache expect(source_project.repository.branch_names).not_to include('markdown') end end |