# Conflicts:
#	app/models/group.rb
#	app/services/merge_requests/update_service.rb
#	app/views/projects/_home_panel.html.haml
#	app/views/projects/new.html.haml
#	app/views/shared/_import_form.html.haml
#	changelogs/unreleased/wip-new-mr-cmd.yml
#	db/schema.rb
#	doc/api/projects.md
#	doc/user/project/import/repo_by_url.md
#	lib/api/entities.rb
#	locale/gitlab.pot
#	spec/models/group_spec.rb

[ci skip]

Create CI/CD-only projects by URL -- CE backport

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

Create CI/CD-only projects by URL FE

Closes #3839

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

Don't error out in system hook if user has `nil` datetime columns

Closes #43871

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

Removed geo_nodes webpack bundle

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

Make oauth provider login generic

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

Release libgit2 cache and open file descriptors after `git gc` run

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

Deleting a user would fail in the system hooks if the user had
`nil` column in `datetime` or `updated_at` fields.

Closes #43871

Use host URL to build JIRA remote link icon

Closes #31081

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

See https://gitlab.com/gitlab-org/gitlab-ee/issues/3839

See https://gitlab.com/gitlab-org/gitlab-ee/merge_requests/4567

See https://gitlab.com/gitlab-org/gitlab-ee/issues/3839

Conflicts:
	app/assets/javascripts/projects/project_new.js
	app/views/shared/_import_form.html.haml
	ee/app/controllers/ee/projects_controller.rb
	ee/spec/features/projects/new_project_spec.rb
	locale/gitlab.pot

Resolve "SSH key add text"

Closes #43829

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

Reduce usage of deprecated *_with_namespace methods

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

Removed service_desk webpack bundle tag

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

EE Port for Project and Groups Badges API

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

Projects and groups badges API

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

Cleanup after adding MR diff's commit_count

Closes #41698

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

Remove impersonate token from flash scope in UI

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

Keep note commit around if commit_id is present

Closes gitaly#1054

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

EE: Port Labels Select dropdown to Vue

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

Port Labels Select dropdown to Vue

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

Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>

Try not to hold env and release the controller after the request.

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

Closes gitaly#1054

Resolve "Not seeing "mentioned in commit" system message after merging"

Closes #43809

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

Incorporate Gitaly's RPCs for Gitlab::Git::LfsChanges

Closes gitaly#1048

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

Add support for :all option to {count,find}_commits

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

Render htmlentities correctly for links not supported by Rinku

Closes #41719

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