# Conflicts:
#	lib/banzai/issuable_extractor.rb

[ci skip]

Include (closed) for closed epics in parsed text

Closes #7341

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

Prepare Banzai to work with group issuables

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

Docs: update GFM guide

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

CE upstream - 2018-10-31 15:53 UTC

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

Build an assets only container

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

Docs: update GFM guide

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

Docs: update GFM guide

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

Send continue parameter on for `cancel_path`

Closes #53335

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

* Run as part of gitlab:assets:compile job

* Will be used by omnibus-gitlab and the CNG images to avoid
compiling multiple times

https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/22235

Remove EE-specific code from 'Discussion' models

Closes #6679

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

Remove EE-specific code from 'Discussion' models

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

We are using hash[symbol][symbol] everywhere else in the test file.

In https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/21595
`ContinueParams` was introducted in the `Projects::JobController#cancel`
since `continue` parameter is not present for in `cancel_path` for
`Projects::JobController#show.sjon` the user is being redirect to the
pipeline page, where it should be redirected to the current job page
instead.

Add the `continue` parameter as a query string for `cancel_path`.

# 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

- add epic extraction to EE IssuableExtractor
- make sure IssuableStateFilter can handle epics

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