gitlab-org--gitlab-foss/app
Douwe Maan 614fd8956b Merge branch '21109-discussion-resolve-runs-a-single-update-query-per-note-but-should-run-a-single-update-query-for-all-notes-instead' into 'master'
Optimize discussion notes resolving and unresolving

## What does this MR do?

Optimize discussion notes resolving and unresolving

## Are there points in the code the reviewer needs to double check?

Some changes had to be made to the discussion spec to account for the fact that notes are not  individually updated now. I only focused on adapting them for the purpose of the regression fix, but admittedly they could be further improved in readability.

## 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)
- [ ] 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)

## What are the relevant issue numbers?

Closes #21109

See merge request !6141
2016-09-08 10:57:03 +00:00
..
assets Merge branch 'blame-ui-fix' into 'master' 2016-09-07 21:19:01 +00:00
controllers Use PipelinesFinder in Pipelines API 2016-09-07 15:38:03 +02:00
finders Use PipelinesFinder in Pipelines API 2016-09-07 15:38:03 +02:00
helpers Merge branch 'blame-ui-fix' into 'master' 2016-09-07 21:19:01 +00:00
mailers remove Ability.abilities 2016-08-30 11:35:06 -07:00
models Merge branch '21109-discussion-resolve-runs-a-single-update-query-per-note-but-should-run-a-single-update-query-for-all-notes-instead' into 'master' 2016-09-08 10:57:03 +00:00
policies Project tools visibility level 2016-09-01 11:47:59 -03:00
services Merge branch 'master' of https://dev.gitlab.org/gitlab/gitlabhq 2016-09-05 17:23:32 +02:00
uploaders
validators
views Merge branch 'blame-ui-fix' into 'master' 2016-09-07 21:19:01 +00:00
workers Optimized event pruning query to avoid two queries. 2016-09-07 12:55:25 -07:00