CE upstream - 2018-08-19 06:21 UTC

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

Remove Gemnasium service

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

Rails5: fix mysql milliseconds problem in project registry spec

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

Update README.md

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

EE: Refactor AutocompleteController

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

Fix incorrect syntax on `code_quality` CI step

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

formatting fix

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

Trivial fix: variable names in error message

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

fix typo

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

Change approvals_missing to approvals_left.

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

Fix `warn_user_is_not_gitlab`

Closes #5896

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

Actually create the job in the `test` stage

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

Documentation: Fix API doc link from MR approval to MR acceptance

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

Rails5: Fix audit event spec

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

This refactors the AutocompleteController according to the guidelines
and boundaries discussed in
https://gitlab.com/gitlab-org/gitlab-ce/issues/49653. Specifically,
ActiveRecord logic is moved to different finders, which are then used in
the controller. View logic in turn is moved to presenters, instead of
directly using ActiveRecord's "to_json" method.

The finder MoveToProjectFinder is also adjusted according to the
abstraction guidelines and boundaries, resulting in a much more simple
finder.

By using finders (and other abstractions) more actively, we can push a
lot of logic out of the controller. We also remove the need for various
"before_action" hooks, though this could be achieved without using
finders as well.

The various finders related to AutcompleteController have also been
moved into a namespace. This removes the need for calling everything
"AutocompleteSmurfFinder", instead you can use
"Autocomplete::SmurfFinder".

Rails5 fix duplicate gpg signature in path lock spec

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

Rails5: fix mysql milliseconds problem in project_spec

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

Rails5: fix mysql milliseconds problem in project_import_state_spec

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

Resolve "Extract EE specific files/lines for Discussion app/helpers"

Closes #6676

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

Ee 25990 interactive web terminals for ci cd jobs docs

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

# Conflicts:
#	app/services/protected_branches/legacy_api_update_service.rb
#	app/services/users/destroy_service.rb
#	db/post_migrate/20180723130817_delete_inconsistent_internal_id_records.rb
#	spec/migrations/delete_inconsistent_internal_id_records_spec.rb
#	spec/spec_helper.rb

[ci skip]

CE upstream - 2018-08-17 09:22 UTC

Closes gitaly#1243, gitaly#1310, and gitaly#1246

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

Remove duplicate test

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

Fix typo

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