summaryrefslogtreecommitdiff
path: root/CHANGELOG
diff options
context:
space:
mode:
authorStan Hu <stanhu@gmail.com>2015-07-01 22:26:14 -0700
committerStan Hu <stanhu@gmail.com>2015-07-02 04:22:51 -0700
commit3e738e3b9aeae5620116109258c4d4da84180e7e (patch)
treed433a56409141671d9c56e6bca3e0ce16f546ce5 /CHANGELOG
parent2ca7ffd094ae285823d1a00b8cf1a7d23b80a2a3 (diff)
downloadgitlab-ce-3e738e3b9aeae5620116109258c4d4da84180e7e.tar.gz
Add support for unlocking users in admin settings
Closes https://github.com/gitlabhq/gitlabhq/issues/9381
Diffstat (limited to 'CHANGELOG')
-rw-r--r--CHANGELOG1
1 files changed, 1 insertions, 0 deletions
diff --git a/CHANGELOG b/CHANGELOG
index 616b41a4269..d7d12034e3b 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 7.13.0 (unreleased)
+ - Add support for unlocking users in admin settings (Stan Hu)
- Fix order of issues imported form 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