# 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

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

# Conflicts:
#	doc/raketasks/cleanup.md

[ci skip]

refs https://gitlab.com/gitlab-org/gitlab-ee/issues/6999

CE upstream - 2018-07-31 21:22 UTC

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

Raise error when stubbing a feature that is not defined on license.rb

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

Port of mk/add-local-project-uploads-cleanup-task to EE

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

Add local project uploads cleanup task

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

# Conflicts:
#	app/controllers/projects/lfs_api_controller.rb
#	spec/requests/lfs_http_spec.rb

[ci skip]

CE upstream - 2018-07-30 21:22 UTC

Closes gitaly#768, #7038, and gitlab-ce#49725

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

Enable no-console ESLint rule for tests

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

Resolve "Pseudonymizer::Uploader should not call abort"

Closes #7026

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

Fix LFS uploads not working with git-lfs 2.5.0

Closes #49752

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

Fix LFS uploads not working with git-lfs 2.5.0 (EE port)

Closes gitlab-ce#49752

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

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