CE upstream - 2018-08-01 12:22 UTC

Closes gitlab-ce#34572

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

CE to EE guide for 11.2

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

Create update guide from 11.1 to 11.2

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

update installation docs branches for source installations

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

Support multiple scopes when authing container registry scopes

Closes #48968

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

CE upstream - 2018-08-01 09:23 UTC

Closes #1756

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

Add support for ssh certificates (internal API)

Closes #34572

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

Update test-and-deploy-python-application-to-heroku.md

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

Rails5: fix flaky spec

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

# Conflicts:
#	app/models/resource_label_event.rb
#	app/services/projects/create_from_template_service.rb
#	app/services/projects/gitlab_projects_import_service.rb
#	app/services/resource_events/change_labels_service.rb
#	db/migrate/20180726172057_create_resource_label_events.rb
#	db/schema.rb
#	doc/administration/index.md
#	doc/api/issues.md
#	locale/gitlab.pot

[ci skip]

Resolve "Allow issue's Internal ID (`iid`) to be set when creating via the API"

Closes #1756

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

[EE] Fix a few disrepencies between CE and EE in the lines ordering

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

Fix a few disrepencies between CE and EE in the lines ordering

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

Resource event model

Closes #47993

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

[EE] Add resource label event model and service

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

[CE Port]: Implement instance level project templates

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

Implement instance level project templates

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

Show one digit after dot in commit_per_day value in charts page.

Closes #26512

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

Search for label on project labels page by title or description

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

Why and how to enable this is covered in the docs being changed
here. This requires gitlab-org/gitlab-shell@2e8b670 ("Add support for
SSH certificate authentication", 2018-06-14) which has been merged in
and tagged as 8.0.0, so GITLAB_SHELL_VERSION needs to be bumped.

Merging this closes gitlab-org/gitlab-ce#34572 see
gitlab-org/gitlab-shell!207 for the gitlab-shell MR.

Implementation notes:

 - The APIs being changed here are all internal, and their sole
   consumer is gitlab-shell.

 - Most of the changed code is a MR to gitlab-shell, see the
   gitlab-org/gitlab-shell!207 MR. That change covers why only some of
   the internal methods get a new "username" parameter, and why some
   others only get a "user_id".

Signed-off-by: Rémy Coutable <remy@rymai.me>

Signed-off-by: Rémy Coutable <remy@rymai.me>

Rename go tool for sast

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

Add a rake task to resync projects where verification has failed

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

CE upstream - 2018-08-01 00:22 UTC

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