Updated to match CE doc updates, see
https://gitlab.com/gitlab-org/gitlab-ce/commit/59944b66b8947c207ebb98ad84ab4aa56ba509e7

See https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/14272

See https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/14272

Conflicts:
	ee/app/views/projects/ee/_merge_request_settings.html.haml

Otherwise it would throw "invalid project feature :fast_forward_merge"
when visiting `/namespace/repo/edit`

EE: Reorganize indexes for the "deployments" table

Closes gitlab-ce#36877

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

Do not perform hard check (presence of file on storage)

Closes gitlab-ce#37945

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

This removes the need for a default scope that adds a "WHERE project_id
= X" clause. This commit also includes an additional index for
Environment#last_deployment, ensuring this query uses just an index scan
instead of also applying a Filter.

Fixes https://gitlab.com/gitlab-org/gitlab-ce/issues/36877

Documentation for LFS object storage

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

Instead perform soft check (the column set to indicate that file does exist)

fix transient failure in path_locks_spec.rb

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

CE Upstream - Monday

Closes gitaly#559, gitlab-ce#37916, and gitlab-ce#36877

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

Detect n+1 issues involving Gitaly

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

Signed-off-by: Rémy Coutable <remy@rymai.me>

Signed-off-by: Rémy Coutable <remy@rymai.me>

Add upgrade notes for Geo in GitLab 10.0

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

Signed-off-by: Rémy Coutable <remy@rymai.me>

Signed-off-by: Rémy Coutable <remy@rymai.me>

Signed-off-by: Rémy Coutable <remy@rymai.me>

Signed-off-by: Rémy Coutable <remy@rymai.me>

Signed-off-by: Rémy Coutable <remy@rymai.me>

Signed-off-by: Rémy Coutable <remy@rymai.me>

Signed-off-by: Rémy Coutable <remy@rymai.me>

Signed-off-by: Rémy Coutable <remy@rymai.me>

Signed-off-by: Rémy Coutable <remy@rymai.me>

[ci skip]

- Expand EE license use for development and testing

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

Fix MR ready to merge buttons/controls at mobile breakpoint -- EE merge edition

Closes gitlab-ce#37259

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

Fix https://gitlab.com/gitlab-org/gitlab-ce/issues/37259

Conflicts:
	app/assets/stylesheets/pages/merge_requests.scss

Fix MR widget with external CI services/integrations -- EE merge edition

Closes gitlab-ce#33287

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

Signed-off-by: Rémy Coutable <remy@rymai.me>

Update SSH database lookup instructions for CentOS 7.4

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

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

Eliminate N+1 queries in loading discussions.json endpoint

Closes #37955

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