# Conflicts:
#	app/assets/javascripts/filtered_search/filtered_search_dropdown_manager.js
#	app/assets/javascripts/filtered_search/filtered_search_manager.js
#	app/assets/javascripts/pages/groups/issues/index.js
#	app/assets/javascripts/pages/projects/issues/index/index.js
#	app/assets/javascripts/pages/search/init_filtered_search.js
#	app/controllers/projects/variables_controller.rb
#	app/models/ci/pipeline.rb
#	app/models/ci/runner.rb
#	app/models/group.rb
#	app/serializers/variable_entity.rb
#	app/services/lfs/lock_file_service.rb
#	app/services/lfs/unlock_file_service.rb
#	config/routes/project.rb
#	db/schema.rb
#	doc/administration/job_artifacts.md
#	doc/api/search.md
#	doc/ci/examples/browser_performance.md
#	doc/ci/variables/README.md
#	doc/topics/autodevops/index.md
#	doc/user/group/index.md
#	doc/user/permissions.md
#	doc/user/project/index.md
#	doc/user/project/issue_board.md
#	doc/user/project/issues/index.md
#	doc/user/project/merge_requests/index.md
#	lib/api/search.rb
#	locale/gitlab.pot
#	spec/javascripts/filtered_search/components/recent_searches_dropdown_content_spec.js
#	spec/javascripts/fixtures/projects.rb
#	spec/lib/gitlab/import_export/all_models.yml
#	spec/requests/api/search_spec.rb
#	spec/services/lfs/lock_file_service_spec.rb
#	spec/services/lfs/unlock_file_service_spec.rb

[ci skip]

CE upstream - 2018-02-07 09:27 UTC

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

Cache Gitaly FindCommit RPC response

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

Add Geo Prometheus metrics about the various number of events

Closes #4688

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

Add missing `stub_ee_application_settings` change to ES specs

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

Remove duplicate calls of MergeRequest#can_be_reverted? on MR widget endpoint

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

Updating `HelpController` spec to use an existing image

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

Resolve "Specs in EE master fail with #show for image formats when requested file exists renders the raw file"

Closes #4846

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

CE Port: for Filtered search releated changes

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

Filtered search support for Epics list page

Closes #4656

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

20868 - Includes External Files in Gitlab CI YML

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

Geo - Ensure that upload deletions are communicated to the secondary

Closes #2103

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

Approve additionally

Closes #4134

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

Reset column information after the schema is migrated in MigrationsHelpers.schema_migrate_up!

Closes gitlab-ee#4813

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

Reset column information after the schema is migrated in MigrationsHelpers.schema_migrate_up!

Closes #4813

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

Clear the timeout in Jobs class after each test

Closes #42830

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