diff options
| author | Valery Sizov <valery@gitlab.com> | 2014-10-27 12:08:44 +0200 |
|---|---|---|
| committer | Valery Sizov <valery@gitlab.com> | 2014-10-27 12:08:44 +0200 |
| commit | 21e8f43af38e20bf99c3e47d01dac9c0f7de3404 (patch) | |
| tree | 785cf4806f15c6e1fa4397eebfa5d9262fececca /CHANGELOG | |
| parent | 477743a154e85c411e8a533980abce460b5669fc (diff) | |
| parent | 6280b53f305e45d0e6c474dbcf684f0015aee385 (diff) | |
| download | gitlab-ce-21e8f43af38e20bf99c3e47d01dac9c0f7de3404.tar.gz | |
Merge branch 'master' into 7-4-stable
Conflicts:
CHANGELOG
VERSION
Diffstat (limited to 'CHANGELOG')
| -rw-r--r-- | CHANGELOG | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/CHANGELOG b/CHANGELOG index 4428bae4ebd..01ae3562ded 100644 --- a/CHANGELOG +++ b/CHANGELOG @@ -1,3 +1,9 @@ +v 7.5.0 + - API: Add support for Hipchat (Kevin Houdebert) + - Add time zone configuration on gitlab.yml (Sullivan Senechal) + - Fix LDAP authentication for Git HTTP access + - Fix LDAP config lookup for provider 'ldap' + v 7.4.2 - Fix internal snippet exposing for unauthenticated users |