# Conflicts:
#	app/assets/javascripts/boards/components/modal/footer.js
#	app/assets/javascripts/boards/components/sidebar/remove_issue.js
#	app/assets/javascripts/boards/stores/boards_store.js
#	spec/javascripts/lib/utils/text_utility_spec.js
[ci skip]

frontend prevent authored votes

Closes #21881

See merge request !6260

Use the hashie-forbideen_attributes gem

Closes #26400

See merge request !10579

Revert "Merge branch 'grpc-1.2.2' into 'master'"

See merge request !10700

Update show.html.haml to allow guests to see the Files tab as per #30199

See merge request !10640

Implement Users::BuildService

Closes #30349

See merge request !10675

Closes #28531 - Enable the import_url field.

Closes #28531

See merge request !9438

Expand components version specification format to allow branches

Closes gitaly#183

See merge request !10610

This reverts merge request !10589

Improve error messages when a record is unable to be created for a project

See merge request !10696

Allow to enable `rspec_profiling` for a branch on the CI

Closes #30907

See merge request !10680

Centered empty state for issues

Closes #30872

See merge request !10689

Add lighter colors and fix existing light colors

See merge request !10690

Make instructions clearer

See merge request !10685

Use an icon to indicate whether service template is active

See merge request !10694

Currently we specify versions for Gitlab-Shell, Workhorse and Gitaly
using version strings, to which we prepend 'v' and assume are tags.
These changes allow branches or tags with other name formats to be
specified by prepending '=' to the version string (á la govendor).

We also simplify the process to reset to the given version (now a
branch or tag): Right now there's a check to supposedly try to avoid
fetching from the remote the version if it already exist locally. But
the previous logic already clones if the directory doesn't exist or
fetches if it does, so this check is pointless. We can safely assume the
version exists once we get to the reset stage.

Resolve "Export CSV button should be inline with RSS button on mobile"

Closes #1878

See merge request !1637

Fix pipeline quota link

Closes #2158

See merge request !1648

Fix appending state to issuable references

Closes #30874

See merge request !10683

Fix typo: NotImplemented -> NotImplementedError

See merge request !1634

After Trace#limit, we seek to the next line in case

Closes #30796

See merge request !10681

Fixed alignment of empty task list items

Closes #29913

See merge request !10480

Correctly parse katex math in IPyhton notebooks

Closes #30900

See merge request !10678

Fix registry for projects with uppercases in path

Closes #30880

See merge request !10674

Rename build minutes to pipeline minutes

Closes #2139

See merge request !1644

CE upstream: Thursday

Closes omnibus-gitlab#1993, gitlab-ce#30642, gitlab-qa#41, and gitlab-ce#30636

See merge request !1647

Resolve "Resolve note loading icon gone"

Closes #30622

See merge request !10628

fix js error in MR remove branch failure handler

Closes #30188

See merge request !10304

Closes #30874.
Ignore nodes with no children.
Append directly to the node instead of the last child of the node
to avoid inheriting formatting from the last child

then it's fine to skip the first line because
it won't be very noticeable