# Conflicts:
#	db/schema.rb

[ci skip]

CE upstream - 2018-11-27 12:22 UTC

Closes gitlab-ce#54466

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

Fix minor grammar issues

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

Don't remove failed install pods

Closes #51792

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

Remove Site Statistic

Closes #53778

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

Add help page link for licence management in CI/CD settings

Closes #8544

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

User#find_by_any_email to respect confirmed flag on secondary emails

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

Adds EE store for upstream/downstream pipelines

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

# Conflicts:
#	app/assets/javascripts/boards/index.js
#	app/assets/javascripts/boards/stores/boards_store.js

[ci skip]

We want to keep failed install pods around so that it is easier to debug
why a failure occured. With this change we also need to ensure that we
remove a previous pod with the same name before installing so that
re-install does not fail.

Another change here is that we no longer need to catch errors from
delete_pod! in CheckInstallationProgressService as we now catch the
ResourceNotFoundError in Helm::Api. The catch statement in
CheckInstallationProgressService was also probably too broad before and
should have been narrowed down simply to ResourceNotFoundError.

Add parseBoolean helper function

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

Add parseBoolean helper function (EE-port)

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

CE upstream - 2018-11-27 00:21 UTC

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

Update environments metrics empty state

Closes #51745

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

Upgrade kubeclient to 4.0.0

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

Remove projects index on mirror and mirror_last_update_at

Closes gitlab-ce#53991

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

Expose External IP address for Knative's gateway

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

Remove notes index on updated_at

Closes #53988

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

Convert "New menu" feature spec to a view spec

Closes #54157

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

Speed up "show GPG badge" feature specs

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

Move VulnerabilityFeedback under namespace

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

Resolve "Warn in Web Editor when user navigates away"

Closes #53728

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

Merge branch '52828-inconsistency-in-fonts-used-for-branch-name-and-create-from-fields-when-creating-new-branch-from-ui' into 'master'

Resolve "Inconsistency in fonts used for branch name and create from fields when creating new branch from UI"

Closes #52828

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

Don't use rugged write-ref anymore

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

Gracefully handle references with null bytes

Closes #54466

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

See
https://github.com/abonas/kubeclient/blob/v4.0.0/lib/kubeclient/common.rb#L395