summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorStan Hu <stanhu@gmail.com>2015-08-13 07:17:21 -0700
committerStan Hu <stanhu@gmail.com>2015-08-13 07:17:21 -0700
commitf6f58cfb1fd7bc7fcef5e9b1f2ce658a15047b1d (patch)
tree09947202f6c2f42f524db94103b673545dbe4a73
parent00a33d67aa5dfcfbc63182106162041d2c60f4de (diff)
parenta8e4c391cdc52657dad03718eb7a38573b639c75 (diff)
downloadgitlab-ce-f6f58cfb1fd7bc7fcef5e9b1f2ce658a15047b1d.tar.gz
Merge branch 'master' of github.com:gitlabhq/gitlabhq
-rw-r--r--CHANGELOG1
-rw-r--r--VERSION2
2 files changed, 1 insertions, 2 deletions
diff --git a/CHANGELOG b/CHANGELOG
index bbbee1d929a..1b4f77ce849 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -32,7 +32,6 @@ v 7.14.0 (unreleased)
- Add support for destroying project milestones (Stan Hu)
- Allow custom backup archive permissions
- Add project star and fork count, group avatar URL and user/group web URL attributes to API
- - Fix bug causing Bitbucket importer to crash when OAuth application had been removed.
- Show who last edited a comment if it wasn't the original author
- Send notification to all participants when MR is merged.
- Add ability to manage user email addresses via the API.
diff --git a/VERSION b/VERSION
index 5778e530e10..da8322eb293 100644
--- a/VERSION
+++ b/VERSION
@@ -1 +1 @@
-7.13.0.pre
+7.14.0.pre