# Conflicts:
#	app/assets/javascripts/environments/components/environments_table.vue
#	app/assets/javascripts/notes/components/note_actions.vue
#	lib/api/triggers.rb

[ci skip]

Merge branch '51271-error-500-due-to-encoding-issues-when-when-attempting-to-access-issues-api' into 'master'

Resolve "Error 500 due to encoding issues when when attempting to access issues API"

Closes #51271

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

CE upstream - 2018-09-11 18:21 UTC

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

New epic custom notifications docs

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

Docs for integrated milestones

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

- utilize the 'out' method to output the 'fence_info',
  which converts to utf8
- output 'sourcepos' again

Filter any parameters ending with "key" in logs

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

Use gitlab-ui loading icon [EE]

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

Use gitlab-ui loading icon

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

This was renamed to DetailedStatusEntity

Rails does a partial match for strings in the filter_parameters
configuration, so the parameter "key" causes "key_id" to be filtered
even though it's a useful parameter for debugging internal API issues.

We now revise this filter to make any parameter ending with "key" is
filtered.

Relates to https://gitlab.com/gitlab-com/gl-infra/production/issues/463

Resolve "500 Internal Server Error: Cherrypick commit with empty branch name"

Closes #50677

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

Generate JUnit report for Karma tests

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

Explicitly use bootstrap 4.1.1

Closes #51362

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

Remove unused GlModal import in delete wiki modal

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

Resolve "Move EE JavaScript tests to their own respective directory"

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

# Conflicts:
#	app/assets/stylesheets/framework/selects.scss

[ci skip]

Fix the group and project activity pages

Closes #51375

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

Add empty state illustration information in job API

Closes #51112

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

Rake geo:status doesn't report CI job artifact numbers

Closes #7216

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

[CE] Fix rails 5 deprecation warnings

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

Resolve "[SCSS Variables Cleanup] Combine all duplicated hex colors in variables.scss", Part 1

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

EE port of 50632-combine-color-duplicates

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

Enable frozen string in vestigial files

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

Use Rails.root for CommonMetricsImporter

Closes #51333

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

Add ability to skip user email confirmation with API

Closes #50876

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

Fixes rails 5 deprecation warnings in `config/` files

CE upstream - 2018-09-11 15:21 UTC

Closes #7009

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