Also avoid double commit lookup during file lock check by reusing
memoized commits.

EE Resolve "Project variables validate without any scopes disregarding environment_scope"

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

Refactor weight select

Closes #4923

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

Resolve "Investigate why GCP Geo nodes cannot move original repository out of the way"

Closes #4871

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

Moves mr widget components into vue files

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

Move EE-specific spec files that were not under spec/ee

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

Make parent_id field integer/null value instead of string

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

Remove dispatcher conflicts with CE

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

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>

CE upstream - 2018-02-14 12:25 UTC

Closes gitlab-qa#148

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

[EE] Fix a too strict array-matching expectation

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

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

Resolve "update-tests-metadata fails in `master`"

Closes #4935

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

# Conflicts:
#	lib/api/entities.rb
#	lib/api/search.rb
#	lib/api/users.rb
#	qa/qa.rb

[ci skip]

Improve `gitlab-ctl replicate-geo-database` additional opts documentation

Closes #4908 and #4822

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

Resolve "Remove notification settings for groups and projects you were previously a member of"

Closes #42481

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

Remove comment about approver making a commit that removes them as approver

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

Adds i18n
Improves test cases

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

Resolve "Error message is not helping when an include is not a valid URL or local path"

Closes #4873 and #4874

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

Bump Geo JWT timeout from 1 minute to 10 minutes

Closes #4881

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

QA with runner cloning the repo with a deploy key

Closes gitlab-qa#148

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

Port of feature/include-custom-attributes-in-api to EE

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