kotovalexarian-likes-gitlab
/
gitlab-org--gitlab-foss
1
0
Fork 0
Code Releases Activity
gitlab-org--gitlab-foss/spec
History
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
..
config Small refactor and a few documentation fixes 2016-08-04 19:02:39 +02:00
controllers Merge branch 'master' of https://dev.gitlab.org/gitlab/gitlabhq 2016-09-05 17:23:32 +02:00
factories Optimize discussion notes resolving and unresolving 2016-09-06 12:14:09 -03:00
features Simulate filtering with url params, clean up accordingly. 2016-09-07 15:36:35 +02:00
finders Use PipelinesFinder in Pipelines API 2016-09-07 15:38:03 +02:00
fixtures Returns the total number of issues in the JSON response 2016-08-31 09:30:37 +01:00
helpers Merge branch '19183-refactor-sidebar-js' into 'master' 2016-09-07 20:54:49 +00:00
initializers Give priority to environment variables 2016-08-03 15:48:48 +01:00
javascripts Merge branch 'fix-textarea-expansion' into 'master' 2016-09-07 20:17:00 +00:00
lib Merge branch 'refactor/ci-config-add-logical-validation' into 'master' 2016-09-07 16:14:37 +00:00
mailers Merge branch 'master' into 'expiration-date-on-memberships' 2016-08-19 10:58:01 +00: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 add project_policy_spec to replace .project_abilities spec 2016-08-30 11:35:06 -07:00
requests Code refactor 2016-09-07 12:10:49 +02:00
routing Fix markdown help references 2016-08-26 09:38:21 -05:00
services Merge branch 'master' of https://dev.gitlab.org/gitlab/gitlabhq 2016-09-05 17:23:32 +02:00
support Make sure DatabaseCleaner.clean runs AFTER Capybara's cleanup 2016-09-04 19:59:00 +03:00
tasks/gitlab Use `File::exist?` instead of `File::exists?` 2016-08-11 13:54:45 +03:00
uploaders
…
views add feature test 2016-09-06 14:42:43 +02:00
workers Added cron to prune events older than 12 months. 2016-09-07 19:41:25 +02:00
factories_spec.rb adds second batch of tests changed to active tense 2016-08-09 15:11:39 +01:00
rails_helper.rb
…
simplecov_env.rb Bump SimpleCov merge timeout to 365 days 2016-08-22 13:44:14 +02:00
spec_helper.rb Merge remote-tracking branch 'upstream/master' into artifacts-from-ref-and-build-name 2016-08-24 20:56:30 +08:00
teaspoon_env.rb Add test coverage analysis for CoffeeScript (!5052) 2016-08-07 21:52:37 +02:00