delta/gitlab/gitlab-ce.git/app/services, branch patch-23

Merge branch 'counters_cache_invalidation' into 'master'

2017-06-12T07:59:12+00:00


Invalidate cache for issue and MR counters separately

See merge request !11394

Merge branch 'backport_fix_slash_commands_for_multiple_assignee' into 'master'

2017-06-12T06:37:14+00:00

Backport from EE: Fix '/unassign' slash command

See merge request !11926

Merge branch 'fix_counter_cache_invalidation' into 'master'

2017-06-08T10:09:17+00:00

Fix counter cache invalidation

Closes #32854 and #32870

See merge request !11736

Merge branch '9-2-stable-fix-conflicts-for-mr-11298' into '9-2-stable'

2017-05-19T15:22:21+00:00

Fix 9.2 conflicts for "Fix conflict resolution from corrupted upstream"

See merge request !11533

Fix 9.2 conflicts for 'Fix conflict resolution from corrupted upstream'

2017-05-19T13:16:56+00:00

Merge branch 'update_assignee_cache_counts_refactoring' into 'master'

2017-05-19T08:41:24+00:00


Rework update_assignee_cache_counts

Closes #31873

See merge request !11270

Merge branch 'get_rid_of_pluck' into 'master'

2017-05-19T08:00:37+00:00


Get rid of pluck in app/services/members/authorized_destroy_service.rb

Closes #32372

See merge request !11433

Merge branch 'fix-conflict-resolution-with-corrupt-repos' into 'master'

2017-05-19T07:32:41+00:00

Fix conflict resolution from corrupted upstream

Closes gitlab-ee#2128

See merge request !11298

Conflicts:
	app/models/merge_request.rb
	spec/models/merge_request_spec.rb

Merge branch 'fixes_for_multiple_issue_assignees' into 'master'

2017-05-19T07:16:35+00:00


Fix for Follow-up from "Backport of Multiple Assignees feature

Closes #31888

See merge request !11178

Merge branch 'fix_removing_invited_member' into 'master'

2017-05-19T05:06:23+00:00

Fix: Deleting an invited member causes 500 error

Closes #32504

See merge request !11481