diff options
| author | Rubén Dávila Santos <ruben@gitlab.com> | 2016-08-19 15:22:46 +0300 |
|---|---|---|
| committer | Ruben Davila <rdavila84@gmail.com> | 2016-08-19 23:24:05 +0300 |
| commit | 40fd2137aec39431d7ca127d9fb56cfdebd90463 (patch) | |
| tree | 0b56e92aa6b0bd6f2f303e09f0ac15f9d5185549 /CHANGELOG | |
| parent | 670dd32ac96279a733d5af98ca0f528423cfafce (diff) | |
Merge branch '21039-member-invite-declined-email-wrong-arguments' into 'master'
Fix notification_service argument error of declined invitation emails
## What does this MR do?
Remove unused arguments that raised the argument error after a refactor, more details in the commit message.
## Are there points in the code the reviewer needs to double check?
## Why was this MR needed?
## What are the relevant issue numbers?
Closes #21039
## Screenshots (if relevant)
## Does this MR meet the acceptance criteria?
- [x] [CHANGELOG](https://gitlab.com/gitlab-org/gitlab-ce/blob/master/CHANGELOG) entry added
- ~~[ ] [Documentation created/updated](https://gitlab.com/gitlab-org/gitlab-ce/blob/master/doc/development/doc_styleguide.md)~~
- ~~[ ] API support added~~
- Tests
- [x] Added for this feature/bug
- [x] All builds are passing
- [x] Conform by the [style guides](https://gitlab.com/gitlab-org/gitlab-ce/blob/master/CONTRIBUTING.md#style-guides)
- [x] Branch has no merge conflicts with `master` (if you do - rebase it please)
- [x] [Squashed related commits together](https://git-scm.com/book/en/Git-Tools-Rewriting-History#Squashing-Commits)
See merge request !5893
Diffstat (limited to 'CHANGELOG')
| -rw-r--r-- | CHANGELOG | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/CHANGELOG b/CHANGELOG index 329e0d35d33..0e9a36ca73f 100644 --- a/CHANGELOG +++ b/CHANGELOG @@ -138,6 +138,7 @@ v 8.11.0 (unreleased) - Each `File::exists?` replaced to `File::exist?` because of deprecate since ruby version 2.2.0 - Add auto-completition in pipeline (Katarzyna Kobierska Ula Budziszewska) - Add pipelines tab to merge requests + - Fix notification_service argument error of declined invitation emails - Fix a memory leak caused by Banzai::Filter::SanitizationFilter - Speed up todos queries by limiting the projects set we join with - Ensure file editing in UI does not overwrite commited changes without warning user |