summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRobert Schilling <rschilling@student.tugraz.at>2014-11-17 01:10:28 +0100
committerRobert Schilling <rschilling@student.tugraz.at>2014-11-17 01:10:28 +0100
commit944e2445c437cd71dbce183d214b0875bea9ed71 (patch)
tree3f583f2192295b8324d52ed2221ed3adbbbd45f9
parentee6da7eacdb3b62931c0549f32ade29e8866fe0b (diff)
parent987007b8dbfdfb6ebd2831f135f3b4b6641f63d0 (diff)
downloadgitlab-ce-944e2445c437cd71dbce183d214b0875bea9ed71.tar.gz
Merge pull request #8312 from bbodenmiller/patch-4
remove duplicate time zone entry in CHANGELOG
-rw-r--r--CHANGELOG3
1 files changed, 1 insertions, 2 deletions
diff --git a/CHANGELOG b/CHANGELOG
index dca9fd74728..d47cbb2c236 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -1,6 +1,6 @@
v 7.5.0
- API: Add support for Hipchat (Kevin Houdebert)
- - Add time zone configuration on gitlab.yml (Sullivan Senechal)
+ - Add time zone configuration in gitlab.yml (Sullivan Senechal)
- Fix LDAP authentication for Git HTTP access
- Run 'GC.start' after every EmailsOnPushWorker job
- Fix LDAP config lookup for provider 'ldap'
@@ -22,7 +22,6 @@ v 7.5.0
- Added a password strength indicator
- Change project name and path in one form
- Display renamed files in diff views (Vinnie Okada)
- - Add timezone configuration to gitlab.yml
- Fix raw view for public snippets
v 7.4.3