summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--CHANGELOG14
-rw-r--r--VERSION2
2 files changed, 15 insertions, 1 deletions
diff --git a/CHANGELOG b/CHANGELOG
index 2eca1f14c4f..c939e159a17 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -1,3 +1,17 @@
+v 3.2.0
+ - Remove project code - use path instead
+ - added username field to user
+ - rake task to fill usernames based on emails create namespaces for users
+ - STI Group < Namespace
+ - Project has namespace_id
+ - Projects with namespaces also namespaced in gitolite and stored in subdir
+ - Moving project to group will move it under group namespace
+ - Ability to move project from namespaces to another
+ - Fixes commit patches getting escaped (see #2036)
+ - Support diff and patch generation for commits and merge request
+ - MergeReqest doesn't generate a temporary file for the patch any more
+ - Update the UI to allow downloading Patch or Diff
+
v 3.1.0
- Updated gems
- Services: Gitlab CI integration
diff --git a/VERSION b/VERSION
index fd2a01863fd..e732692003c 100644
--- a/VERSION
+++ b/VERSION
@@ -1 +1 @@
-3.1.0
+3.2.0pre