diff options
| author | Dmitriy Zaporozhets <dzaporozhets@gitlab.com> | 2015-02-09 21:08:45 +0000 |
|---|---|---|
| committer | Dmitriy Zaporozhets <dzaporozhets@gitlab.com> | 2015-02-09 21:08:45 +0000 |
| commit | 86bb522713e8519e7b6c06f1fcb2cc752cc37212 (patch) | |
| tree | 1f5fc099816640757cfc8221b063bd1964c7a27d | |
| parent | 72decfb1b9023c6019afe9f1608830d7e93f6872 (diff) | |
| parent | f5769c4cedc6a1ce2df8b54763ce13c8e441c60d (diff) | |
| download | gitlab-ce-86bb522713e8519e7b6c06f1fcb2cc752cc37212.tar.gz | |
Merge branch 'changelog-description' into 'master'
Changelog description
Please merge before tomorrow.
See merge request !1491
| -rw-r--r-- | CHANGELOG | 7 | ||||
| -rw-r--r-- | CONTRIBUTING.md | 2 |
2 files changed, 6 insertions, 3 deletions
diff --git a/CHANGELOG b/CHANGELOG index 74d4031ebaf..6f3ee9f2726 100644 --- a/CHANGELOG +++ b/CHANGELOG @@ -1,6 +1,9 @@ -Note: The upcoming release contains empty lines to reduce the number of merge conflicts, scroll down to see past releases. +Note: The upcoming release below contains empty lines. +This helps to reduce the number of merge conflicts. +Scroll down to see the released versions of GitLab. +Please pick a random empty line to add new content. -v 7.8.0 +v 7.8.0 (unreleased) - Replace highlight.js with rouge-fork rugments (Stefan Tatschner) - Make project search case insensitive (Hannes Rosenögger) - Include issue/mr participants in list of recipients for reassign/close/reopen emails diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md index d26cf567e36..f3d4d8ea9b6 100644 --- a/CONTRIBUTING.md +++ b/CONTRIBUTING.md @@ -63,7 +63,7 @@ If you can, please submit a merge request with the fix or improvements including 1. Fork the project on GitLab Cloud 1. Create a feature branch 1. Write [tests](README.md#run-the-tests) and code -1. Add your changes to the [CHANGELOG](CHANGELOG) insert your line at a [random point](doc/workflow/gitlab_flow.md#do-not-order-commits-with-rebase) in the current version +1. Add your changes to the [CHANGELOG](CHANGELOG) 1. If you are changing the README, some documentation or other things which have no effect on the tests, add `[ci skip]` somewhere in the commit message 1. If you have multiple commits please combine them into one commit by [squashing them](http://git-scm.com/book/en/Git-Tools-Rewriting-History#Squashing-Commits) 1. Push the commit to your fork |