summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>2015-04-17 14:43:44 +0000
committerDmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>2015-04-17 14:43:44 +0000
commita66953b16bab5ecf874958d1acb3520ed7490559 (patch)
tree3d9d973c142444a5a5c2b24e748d015d19a9b55a
parente1099f9717bca992196b640576ab63fb6b9e34d6 (diff)
parent632d05e86583cf0f11aac6a62f4dd0be84993008 (diff)
downloadgitlab-ce-a66953b16bab5ecf874958d1acb3520ed7490559.tar.gz
Merge branch 'google-code-changelog' into 'master'
Add Google Code importer to changelog. cc @dzaporozhets See merge request !537
-rw-r--r--CHANGELOG1
1 files changed, 1 insertions, 0 deletions
diff --git a/CHANGELOG b/CHANGELOG
index adcc3b96d11..be96d712439 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -12,6 +12,7 @@ v 7.11.0 (unreleased)
-
v 7.10.0 (unreleased)
+ - Allow projects to be imported from Google Code.
- Allow users to be invited by email to join a group or project.
- Don't crash when project repository doesn't exist.
- Add config var to block auto-created LDAP users.