diff options
author | Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> | 2015-06-05 13:37:08 +0000 |
---|---|---|
committer | Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> | 2015-06-05 13:37:08 +0000 |
commit | 5a026152b745d5a716c522bc58a76682ee534e25 (patch) | |
tree | 0579a0d6522650f0ae929b6d200d2ddcc746db6c /CHANGELOG | |
parent | 6f7bf4e4f0ea40c4f69354b8ce75c77af4fab5cb (diff) | |
parent | 5256b5cc060338fb597e3519a18bf6a3faa4cf8c (diff) | |
download | gitlab-ce-5a026152b745d5a716c522bc58a76682ee534e25.tar.gz |
Merge branch 'warn-about-referenced-users' into 'master'
Show warning when a comment will add 10 or more people to the discussion.
Addresses internal issue https://dev.gitlab.org/gitlab/gitlabhq/issues/2054
New issue:
![Screen_Shot_2015-06-02_at_14.48.46](https://gitlab.com/gitlab-org/gitlab-ce/uploads/6771ff8748b9b548a9f0f32a5a8b9bb1/Screen_Shot_2015-06-02_at_14.48.46.png)
New comment:
![Screen_Shot_2015-06-02_at_14.48.51](https://gitlab.com/gitlab-org/gitlab-ce/uploads/25ec5f06490e1e6b36e453e055a7b403/Screen_Shot_2015-06-02_at_14.48.51.png)
See merge request !754
Diffstat (limited to 'CHANGELOG')
-rw-r--r-- | CHANGELOG | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/CHANGELOG b/CHANGELOG index 4d7d406b43f..624dd3a5c48 100644 --- a/CHANGELOG +++ b/CHANGELOG @@ -4,6 +4,7 @@ v 7.12.0 (unreleased) - Fix timeout when rendering file with thousands of lines. - Don't notify users mentioned in code blocks or blockquotes. - Omit link to generate labels if user does not have access to create them (Stan Hu) + - Show warning when a comment will add 10 or more people to the discussion. - Disable changing of the source branch in merge request update API (Stan Hu) - Shorten merge request WIP text. - Add option to disallow users from registering any application to use GitLab as an OAuth provider |