Merge branch 'YarNayar/gitlab-ce-23460-send-email-when-pushing-more-commits-to-the-merge-request' into 'master'

Send notification emails when push to a merge request

Closes #23460

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

Bump `state_machines-activerecord` to `0.5.1`

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

[CE] ProtectedBranch API omits empty declared params

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

Docs organize main page by product category

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

Array.fill polyfill for IE 11 compatibility.

Closes #44103

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

Disable cursor for review mode in the IDE

Closes #44307

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

Merge branch '43316-controller-parameters-handling-sensitive-information-should-use-a-more-specific-name' into 'master'

Resolve "Controller parameters handling sensitive information should use a more specific name"

Closes #43316

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

Closes #23460

add SHA1 fingerprint requirement

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

Remove N+1 query for Noteable association.

Closes #43150

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

Resolve "Forking with namespace doesn't work (API)"

Closes #40798

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

Resolve "Update grape to v1.0.2 when it is released"

Closes #40843

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

Add missing changelog entries for 10.6.0

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

[ci skip]

Make use of the prettier ignore file during our save script

Closes #44581

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

[Rails5] Update files by `rails app:update`

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

Fix a test that is going to break, that has not broken yet

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

Cleanup test for disabling comment submit button

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

Merge branch '44564-error-500-while-attempting-to-resolve-conflicts-due-to-utf-8-conversion-error' into 'master'

Resolve "Error 500 while attempting to resolve conflicts due to UTF-8 conversion error"

Closes #44564

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

Merge branch '44218-add-internationalization-support-for-the-prometheus-merge-request-widget' into 'master'

Resolve "Add internationalization support for the Prometheus Merge Request widget"

Closes #44218

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

When we added caching, this meant that calling `can_be_resolved_in_ui?` didn't
always call `lines`, which meant that we didn't get the benefit of the
side-effect from that, where it forced the conflict data itself to UTF-8.

To fix that, make this explicit by separating the `raw_content` (any encoding)
from the `content` (which is either UTF-8, or an exception is raised).

Resolve "Problem with prettier setting trailingComma: all"

Closes #44589

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

Move GitLab.com settings under main docs

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

Use gitlab-shell 7.1.1

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

Fix EncodingHelper#clean blowing up on UTF-16BE strings

Closes gitaly#1101

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