# Conflicts:
#	.gitlab-ci.yml

[ci skip]

Add BUILD_ASSETS_IMAGE CI variable

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

Add BUILD_ASSETS_IMAGE CI variable

* Defaults to FALSE
* Can be used to disable building/pushing the assets image in the
gitlab:compile:assets job

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

Remove unused project method

Closes #54103

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

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

Closes gitlab-ce#54059, #8311, and gitaly#1393

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

Bump Gitaly version to 0.132.0

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

* Defaults to FALSE
* Can be used to disable building/pushing the assets image in the
gitlab:compile:assets job

* Defaults to FALSE
* Can be used to disable building/pushing the assets image in the
gitlab:compile:assets job

Prevents empty button in jobs empty state

Closes #54021

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

Remove display of local Sidekiq process in /admin/sidekiq

Closes #46133

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

https://gitlab.com/gitlab-org/gitlab-ee/merge_requests/8472/

# Conflicts:
#	.gitlab-ci.yml

[ci skip]

Use the new parallel keyword in .gitlab-ci.yml

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

[EE] Use the new parallel keyword in .gitlab-ci.yml

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

In a cloud-native or high-availability configuration, Sidekiq may not
be running on the same node as the Web worker. The output of the `ps`
output does not work in this case and can mislead admins that
Sidekiq isn't running. Remove it in favor of the Sidekiq dashboard,
which shows local processes using the Redis information.

Closes https://gitlab.com/gitlab-org/gitlab-ce/issues/46133

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

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

Fix types comment

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

Signed-off-by: Rémy Coutable <remy@rymai.me>

Signed-off-by: Rémy Coutable <remy@rymai.me>

Move EE prepend/include to the end of helpers

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

Update config map if already present on install

Closes #53626

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

Remove Gemfile.rails5

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

Add knative client to kubeclient library

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

Ignore environment validation failure

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

This file is not needed anymore (since we switched to rails 5 already).

Remove 'comment_on_any_diff_line' feature flag

Closes #54034

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

When an application install fails, and the user retries install, the
configmap for the application will already exists. If so, we simply
update instead of create.

Avoid Gitaly RPC errors when fetching diff stats

Closes gitaly#1393

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

Switch kubernetes:active with checking $KUBECONFIG

Closes gitlab-ee#8311

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

Don't care about order when getting awarded issues

Closes #53491

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

Fixing failing master:
https://gitlab.com/gitlab-org/gitlab-ce/-/jobs/116776474

Fix a typo in Admin: intergration -> integration

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

Fix a typo in Admin: intergration -> integration

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

Add documentation on how to use structured logging

Closes #54059

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