diff options
| author | Jacob Schatz <jschatz@gitlab.com> | 2016-09-15 22:23:07 +0000 |
|---|---|---|
| committer | Jacob Schatz <jschatz@gitlab.com> | 2016-09-15 22:23:07 +0000 |
| commit | 911b3d88cf62009133f762daf69ee1954841dd81 (patch) | |
| tree | 67c252eefc0b150563960818ac25041dbbf17865 /docker-compose.yml | |
| parent | d2370422c5d5f2b011b8c2349dab964e4088284b (diff) | |
| parent | c67d2f46dd24d6f2bfc0d64ed62a4a6b47f1fcc0 (diff) | |
| download | gitlab-ce-911b3d88cf62009133f762daf69ee1954841dd81.tar.gz | |
Merge branch 'ee-919-backport-changes' into 'master'
Restore gl_dropdown.js changes
Restores `fieldName` to allow only string values. `fieldName` was changed to accept function as a value in https://gitlab.com/gitlab-org/gitlab-ee/merge_requests/581 Since the approach changed in https://gitlab.com/gitlab-org/gitlab-ee/merge_requests/687 there's no need to accept function as value.
Backport changes from https://gitlab.com/gitlab-org/gitlab-ee/merge_requests/687
EE Issue: https://gitlab.com/gitlab-org/gitlab-ee/issues/919
See merge request !6234
Diffstat (limited to 'docker-compose.yml')
0 files changed, 0 insertions, 0 deletions