diff options
| author | Jacob Schatz <jschatz@gitlab.com> | 2016-09-16 01:23:07 +0300 |
|---|---|---|
| committer | Rémy Coutable <remy@rymai.me> | 2016-09-19 17:09:10 +0300 |
| commit | 98ac1eee3e758ac856b01c7c0b3c6f6e030dd992 (patch) | |
| tree | 6d66c69670b558d7be187821f5ff34e2f63d3e67 /CHANGELOG | |
| parent | 3a713ef1badabd8ab91bee24b88bad54267d4df1 (diff) | |
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
Signed-off-by: Rémy Coutable <remy@rymai.me>
Diffstat (limited to 'CHANGELOG')
| -rw-r--r-- | CHANGELOG | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/CHANGELOG b/CHANGELOG index dd8049e8638..4f7681894e3 100644 --- a/CHANGELOG +++ b/CHANGELOG @@ -1,6 +1,7 @@ Please view this file on the master branch, on stable branches it's out of date. v 8.11.7 + - Restores `fieldName` to allow only string values in `gl_dropdown.js`. !6234 - Allow the Rails cookie to be used for API authentication. v 8.11.6 |