# Conflicts:
#	app/assets/javascripts/ide/components/ide_project_tree.vue
#	app/assets/javascripts/ide/components/repo_file.vue
#	app/assets/javascripts/ide/ide_router.js
#	app/assets/javascripts/ide/stores/workers/files_decorator_worker.js
#	app/views/projects/tree/_tree_header.html.haml
#	config/webpack.config.js
#	db/schema.rb

[ci skip]

Add docs on CI caching

Closes #32515, #18945, and gitlab-runner#1621

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

Move TimeTrackingCollapsedState vue component

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

CE upstream - 2018-03-21 00:25 UTC

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

Add docs for ChatOps

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

Clarify location of Procfile for mail_room

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

- New cache page
- Move manual cache clearing to the new page
- Add all directives of cache in the yaml reference

Update omniauth 1.4.2 -> 1.8

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

Merge branch '5358-hard-failing-mirror-fails-for-personal-project-with-blocked-owners' into 'master'

Resolve "Hard-failing a mirror fails for personal projects with blocked owners"

Closes #5358

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

Backports changes made in https://gitlab.com/gitlab-org/gitlab-ee/merge_requests/5063 to CE

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

[Rails5] Add `Gemfile.rails5`

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

Issuable list: add tooltips to icons

Closes #43786

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

Fixes the web IDE link in tree list opening the wrong URL

Closes #44477

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

[Rails5] Update ar5_batching initializer

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

[Rails5] Update ar5_pg_10_support initializer

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

Remove parser warnings workaround

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

Also log Prometheus metrics from the primary

Closes #5373

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

Send Gitaly payload for git-upload-archive SSH commands

Closes gitaly#1092

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

Move db/migrate/20171222151344_add_regexp_uses_re2_to_push_rules.rb

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

Add indexes for user activity queries.

Closes #44446

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

makes caret go to the right side when closing most right issueboard list

Closes #40913

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

Closes gitlab-org/gitlab-ee#5373.

Convenient use of concurrent migration helpers

Closes #43887

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

Geo - Switch from time-based checking of outdated checksums to the nil-checksum-based approach

Closes #5176 and #5346

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

Improve wording of cluster monitoring docs

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

NestingDepth (level 5) in framework/dropdowns.scss

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

fix spelling of fdw table name that caused 500 error

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

to ee directory.

Updated in:
https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/17673