summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorStan Hu <stanhu@gmail.com>2015-07-11 17:56:51 +0000
committerStan Hu <stanhu@gmail.com>2015-07-11 17:56:51 +0000
commitdc6aa1d34a3f78a757d829eb8cd050fa381cef99 (patch)
treefdf5361defee0b251e13b38d1088b3bb98216863
parentd0b240136a444a61c3c8960cba33f987022fa0f4 (diff)
parente9df1cd363837ec8ca06d99b85292bb32b28aa29 (diff)
downloadgitlab-ce-dc6aa1d34a3f78a757d829eb8cd050fa381cef99.tar.gz
Merge branch 'fix-changelog-typos' into 'master'
Fix typo and remove duplicate entry shipped in v7.12.2 See merge request !965
-rw-r--r--CHANGELOG3
1 files changed, 1 insertions, 2 deletions
diff --git a/CHANGELOG b/CHANGELOG
index 7d5f186d755..56f6a48cc51 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -8,12 +8,11 @@ v 7.13.0 (unreleased)
- Remove link leading to a 404 error in Deploy Keys page (Stan Hu)
- Add support for unlocking users in admin settings (Stan Hu)
- Add Irker service configuration options (Stan Hu)
- - Fix order of issues imported form GitHub (Hiroyuki Sato)
+ - Fix order of issues imported from GitHub (Hiroyuki Sato)
- Bump rugments to 1.0.0beta8 to fix C prototype function highlighting (Jonathon Reinhart)
- Fix Merge Request webhook to properly fire "merge" action when accepted from the web UI
- Add `two_factor_enabled` field to admin user API (Stan Hu)
- Fix invalid timestamps in RSS feeds (Rowan Wookey)
- - Fix error when deleting a user who has projects (Stan Hu)
- Fix downloading of patches on public merge requests when user logged out (Stan Hu)
- The password for the default administrator (root) account has been changed from "5iveL!fe" to "password".
- Fix Error 500 when relative submodule resolves to a namespace that has a different name from its path (Stan Hu)