From 98ac1eee3e758ac856b01c7c0b3c6f6e030dd992 Mon Sep 17 00:00:00 2001 From: Jacob Schatz Date: Thu, 15 Sep 2016 22:23:07 +0000 Subject: Merge branch 'ee-919-backport-changes' into 'master' MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 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 --- CHANGELOG | 1 + 1 file changed, 1 insertion(+) (limited to 'CHANGELOG') 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 -- cgit v1.2.3