# Conflicts:
#	app/assets/javascripts/pages/projects/project.js
#	app/views/projects/_flash_messages.html.haml
#	config/sidekiq_queues.yml
#	locale/gitlab.pot

[ci skip]

Remove striped table styling of Find files view

Closes #51162

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

FE for "Uploads to a wiki should be stored inside the wiki git repository"

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

Resolve "Make margin of user status emoji consistent"

Closes #49644

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

Displays banner to notify users ADO is implicitly enabled

Closes #50535

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

Merge branch 'ee-50535-display-banner-to-notify-user-if-project-is-implicitly-opted-ado' into 'master'

EE port of Displays banner to notify users ADO is implicitly enabled

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

CE upstream - 2018-09-06 18:22 UTC

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

Resolve "Clean up the top section of the cluster page"

Closes #49632 and #50490

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

Port of Resolve "Clean up the top section of the cluster page" to EE

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

EE port (Update eslintrc no-param-reassign to allow props reassignment)

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

Update eslintrc no-param-reassign to allow props reassignment

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

Merge branch '7211-geo-synchronization-does-not-seem-to-replicate-default-branch-all-the-time' into 'master'

Backport Gitlab::Git::Repository#find_remote_root_ref to CE

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

Automatically disable Auto DevOps for project upon first pipeline failure

Closes #39923

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

EE Port for https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/21172

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

Disable statement timeout in RenameLoginRootNamespaces migration

Closes #50980

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

Merge branch '7419-running-git-clone-with-a-secondary-geo-node-url-has-lfs-batch-download-redirected-to-primary' into 'master'

Resolve "Running git clone with a secondary geo node URL has LFS batch download redirected to primary"

Closes #7419

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

# Conflicts:
#	doc/administration/high_availability/gitlab.md
#	doc/administration/high_availability/redis.md
#	doc/api/jobs.md
#	doc/user/markdown.md
#	doc/user/project/integrations/jira.md
#	doc/user/project/issue_board.md
#	lib/gitlab/tree_summary.rb

[ci skip]

CE upstream - 2018-09-06 15:24 UTC

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

Bulk-render commit titles in the tree view to improve performance

Closes #43140

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