# Conflicts:
#	doc/development/contributing/merge_request_workflow.md

[ci skip]

Using inline links for require QA tests part of definition of done per review feedback

See merge request gitlab-org/gitlab-ee!8194

docs - Update definition of done with e2e tests requirement

Closes gitlab-org/quality/team-tasks#67

See merge request gitlab-org/gitlab-ce!22655

Update license_management job

See merge request gitlab-org/gitlab-ce!22732

Update mysql.md with correct anchor link to "how services are linked"

See merge request gitlab-org/gitlab-ce!22739

CE upstream - 2018-11-04 03:21 UTC

See merge request gitlab-org/gitlab-ee!8220

Merge branch '53467-transient-failure-in-spec-controllers-groups-boards_controller_spec-rb' into 'master'

Resolve "Transient failure in spec/controllers/groups/boards_controller_spec.rb"

Closes #53467

See merge request gitlab-org/gitlab-ce!22785

CE upstream - 2018-11-03 15:21 UTC

See merge request gitlab-org/gitlab-ee!8219

Optimize merge request refresh by using the database to check commit SHAs

See merge request gitlab-org/gitlab-ce!22731

Geo: Admin > Geo > Projects support for batch operations

Closes #8120

See merge request gitlab-org/gitlab-ee!7806

CE upstream - 2018-11-02 21:21 UTC

See merge request gitlab-org/gitlab-ee!8212

Rails5: fix operations controller spec nil parameter

See merge request gitlab-org/gitlab-ee!8209

Instead of a single class iterating in batches and executing the
operation there, we iterate in bigger batches to get the ranges and
delegate to a separate worker that will operate in the ranges.

Added Resync all and Recheck all actions to the Geo > Projects page.

Added ProjectRegistryBatchWorker that is responsible for doing mass
update on the ProjectRegistry entries to flag them as requiring recheck
or resync.

Use our own docker image for helm install pods

See merge request gitlab-org/gitlab-ce!22778

Previously for a given merge request, we would:

1. Create the array of commit SHAs involved in the push (A)
2. Request all merge request commits and map the SHA (B)
3. Reload the diff if there were any common commits between A and B

We can avoid additional database querying and overhead by
checking with the database whether the merge request contains any
of the commit SHAs.

Relates to https://gitlab.com/gitlab-org/gitlab-ce/issues/53213

CE upstream - 2018-11-02 17:21 UTC

See merge request gitlab-org/gitlab-ee!8210

This will reduce dependencies and failure points during installation. It
will also reduce security risks from untrusted dependencies being able
to effect all our users

CE upstream - 2018-11-02 14:21 UTC

See merge request gitlab-org/gitlab-ee!8199

Add email for milestone change

Closes #51520

See merge request gitlab-org/gitlab-ce!22279

Port of ccr/51520_change_milestone_email to EE

See merge request gitlab-org/gitlab-ee!7953

Incorporates Kubernetes Namespace into Cluster's flow

See merge request gitlab-org/gitlab-ce!22011

Move `prepend` outside the `class` block for finders

See merge request gitlab-org/gitlab-ee!8192

Don't log fabricate args

See merge request gitlab-org/gitlab-ce!22753

Prevents logging of sensitive data

# Conflicts:
#	app/controllers/concerns/project_unauthorized.rb
#	app/controllers/projects/clusters_controller.rb
#	app/helpers/clusters_helper.rb
#	app/views/clusters/clusters/_integration_form.html.haml
#	config/routes.rb

[ci skip]