diff options
| author | Douwe Maan <douwe@gitlab.com> | 2016-04-04 14:25:15 +0000 |
|---|---|---|
| committer | Douwe Maan <douwe@gitlab.com> | 2016-04-04 14:25:15 +0000 |
| commit | ba7fcc9866588eb215fc69f5d8b73c77805e4eef (patch) | |
| tree | 282f0a18f0b568c843213f8c1ca7711c852af055 /config/mail_room.yml | |
| parent | df77df46f5df41b53eff4906a19b8523a007671b (diff) | |
| parent | e6b5716785a31396c2aa8b044a087e8b2ca5fac3 (diff) | |
| download | gitlab-ce-ba7fcc9866588eb215fc69f5d8b73c77805e4eef.tar.gz | |
Merge branch 'update_repository_from_ee' into 'master'
Migrate Repository#local_branches from gitlab-ee.
REF: https://gitlab.com/gitlab-org/gitlab-ee/merge_requests/249
This will help us to avoid posible merge conflicts when merging
gitlab-ce to gitlab-ee
See merge request !3496
Diffstat (limited to 'config/mail_room.yml')
0 files changed, 0 insertions, 0 deletions