# Conflicts:
#	lib/gitlab/email/handler.rb

including verifying the project_slug

We now appended `-` and the project id in order
to support catch all email addresses

We now use `-issue` in order to support catch all email addresses

We now use `-merge-request` instead of `+merge-request+`
in order to support catch all email addresses

We now use `-unsubscribe` instead of `+unsubscribe`
in order to support catch all email addresses

Fix missing QA selector in note_form.vue

Closes #9033

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

Integrate mobile CSS framework into specific frameworks

Closes #54386

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

Force popover-header to size 14px instead of rems

Closes gitlab-ee#8941

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

https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/22985
was merged 3 hours ago, but the CE->EE merge in
04a8d3aa dropped the changes in EE because of conflicts.

Restore this selector so master is no longer broken.

Closes https://gitlab.com/gitlab-org/gitlab-ee/issues/9033

Remove dash on issue weight for unauthorized users

Closes #8888

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

CE Port of "(Part 1) FE multiple approval rules settings - empty state"

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

Add rel=me to user's website link

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

rel=me links allow cross-linking of user's identities. This behavior is
used by software to determine if user controls profiles on two different
sites. For example Mastodon uses it to display verified badge on links.

Both Twitter and GitHub automatically add rel=me to links added to
users' profiles.

See: https://www.zylstra.org/blog/2018/10/mastodon-rel-me/
See: http://microformats.org/wiki/rel-me

Drop Webhooks from project import/export config

Closes #53513

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

Add JSON responder at `#index` endpoint in feature flag controller

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

Remove unnecessary top margin in modal header titles

Closes #55883

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

Collapsible Comments Test for Issues

Closes #52617

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

Implement CI/CD bridge transitions

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

Fix deprecation: Using positional arguments in integration tests

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

Update web ide interactive terminal Gitlab version

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

Webhook URLs were recently encrypted in the database via
https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/21645, and as a
result they are no longer exported. When an exported project with
Webhooks is imported, the project import service will fail with
`URI::InvalidURIError: bad URI(is not URI?)` due to a blank URL.
We avoid this by disabling the export/import of Webhooks in
the first place.

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

Use reports syntax for Dependency scanning job

Closes #54844

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