# Conflicts:
#	app/assets/javascripts/dispatcher.js
#	app/assets/javascripts/filtered_search/filtered_search_dropdown_manager.js
#	app/assets/javascripts/pages/search/init_filtered_search.js
#	app/views/groups/issues.html.haml
#	config/webpack.config.js
#	doc/user/project/integrations/prometheus_library/kubernetes.md
#	spec/javascripts/filtered_search/dropdown_user_spec.js

[ci skip]

Improve link for CI environment variable, wording.

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

Rest of Dispatcher Refactor (EE)

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

Rest of Dispatcher Refactor

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

CE upstream - 2018-02-21 18:26 UTC

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

Use dynamic imports for project dispatcher paths (EE)

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

Use dynamic imports for project dispatcher paths

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

# Conflicts:
#	app/views/shared/milestones/_sidebar.html.haml
#	config/webpack.config.js

[ci skip]

Update Browser Performance Testing Example

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

Update EE Browser Performance Testing Example

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

Optimize and improve the inline documentation for the codequality job

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

Resolve "Code quality shows `check_name`, but should show `description`"

Closes #4939

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

CE upstream - 2018-02-21 15:21 UTC

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

#28481: Display time tracking totals on milestone page

Closes #28481

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

Display time tracking totals on milestone page (EE)

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

Resolve "[Gem Update] update toml-rb to 1.0.0"

Closes #36847

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

Minor tweak to browser performance testing MR widget docs

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

Add missing pagination on the commit diff endpoint

Closes #43370

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

Be more transparent about the version check

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

Fix new project path input overlapping, height and radius #41811

Closes #41811

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

Apply new default and inline label design #34725

Closes #34725

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

Resolve "Update to github-linguist 5.3.x"

Closes #26039

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

Fixes an invalid documentation for the .gitlab-ci.yml cache:key

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

Resolve "API: PUT /projects/:id fails when only ci_config_path is specified"

Closes #42509

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

Resolve "Remove underline for avatar"

Closes #35418

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

fix docs link

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

Guard against nil Sidekiq metrics server

Closes #41351

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

Resolve "Pages Domain API returns 404 when using a specific domain"

Closes #40668

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

emoji.codes is now emojicopy.com

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

Refactor IssuableFinder to extract model-specific logic

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