# Conflicts:
#	lib/api/issues.rb

[ci skip]

CE upstream - 2018-10-31 11:21 UTC

Closes gitlab-ce#53259 and gitlab-org/release/framework#26

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

Remove gitlab-ui's pagination from global

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

Remove gitlab-ui's modal from global

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

Remove gitlab-ui's modal from global (EE)

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

Fix typos in IDE props

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

EE port of Adds required prop to the post merge pipeline

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

Adds required prop to the post merge pipeline

Closes #53386

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

EE port of Adds required prop to the post merge pipeline

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

Add gitlab:packages:migrate task to migrate package files to object storage

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

Split CE and EE params in issues API

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

Allow filtering by weight in issues API

Closes #7927

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

Two different MRs updating the same code were merged
and this was not caught prior to merge.
This MR adds the missing prop to the post merge pipeline

Fix conflicts for  app/assets/javascripts/vue_merge_request_widget/components/mr_widget_pipeline.vue

# Conflicts:
#	app/assets/javascripts/vue_merge_request_widget/components/mr_widget_pipeline.vue
#	app/models/blob.rb
#	locale/gitlab.pot
#	spec/javascripts/vue_mr_widget/mock_data.js

[ci skip]

Document implicit feature flag checks

Closes gitlab-org/release/framework#26

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

Merge branch '41545-gitlab-merge-request-status-could-not-connect-to-the-ci-server-please-check-your-settings-and-try-again' into 'master'

Resolve "Reword error message for internal CI unknown pipeline status"

Closes #53056

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

Merge branch 'ee-41545-gitlab-merge-request-status-could-not-connect-to-the-ci-server-please-check-your-settings-and-try-again' into 'master'

EE Resolve "Reword error message for internal CI unknown pipeline status"

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

CE upstream - 2018-10-30 14:22 UTC

Closes gitlab-ce#51128, gitlab-ce#51142, gitlab-ce#53072, gitlab-ce#53153, gitlab-ce#53317, gitlab-org/quality/staging#14, and #6067

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

Cherry-picked from master to resolve automated CE-to-EE MR spec
failures.

Renaming Secret Variables in the codebase (EE Port)

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

Add instructions to find the usage ping payload

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

Absorb product into factory

Closes gitlab-ce#52992

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

CE: Absorb product into factory

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

Refactor the backup/restore docs

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

Added info on getting k8s integration for existing cluster

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

Fix broken ie11 due to non-transpiled components in gitlab-ui

Closes #53052

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