diff options
| author | James Lopez <james@jameslopez.es> | 2016-04-15 08:52:26 +0200 |
|---|---|---|
| committer | James Lopez <james@jameslopez.es> | 2016-04-15 08:52:26 +0200 |
| commit | ca725aaf4ca7cb300c50d539fe27efc45a32dfd6 (patch) | |
| tree | 2b57979ae2fcdf99ec4f72557f19d17243e29af7 | |
| parent | 05985b49a45ace4d43701e16a61e5cea74ac4a35 (diff) | |
| download | gitlab-ce-fix/project-import_url.tar.gz | |
resolve merge conflictfix/project-import_url
| -rw-r--r-- | CHANGELOG | 6 |
1 files changed, 1 insertions, 5 deletions
diff --git a/CHANGELOG b/CHANGELOG index d0638c880cf..6de5a9b9389 100644 --- a/CHANGELOG +++ b/CHANGELOG @@ -57,11 +57,6 @@ v 8.7.0 (unreleased) - Fix admin/projects when using visibility levels on search (PotHix) - Build status notifications - API: Expose user location (Robert Schilling) - - Add encrypted credentials for imported projects and migrate old ones - -v 8.6.5 (unreleased) - - Only update repository language if it is not set to improve performance - - Check permissions when user attempts to import members from another project - API: Do not leak group existence via return code (Robert Schilling) - ClosingIssueExtractor regex now also works with colons. e.g. "Fixes: #1234" !3591 - Update number of Todos in the sidebar when it's marked as "Done". !3600 @@ -73,6 +68,7 @@ v 8.6.5 (unreleased) - Diffs load at the correct point when linking from from number - Selected diff rows highlight - Fix emoji catgories in the emoji picker + - Add encrypted credentials for imported projects and migrate old ones v 8.6.6 - Fix error on language detection when repository has no HEAD (e.g., master branch). !3654 (Jeroen Bobbeldijk) |