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

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

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

Allow including custom attributes in API responses

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

Add information about projects when searching in wiki_blobs, blobs, commits scopes

Closes #42934

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

EE port of: API - Include project in commits&blobs search results

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

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

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

Display a link to external issue tracker when enabled

Closes #37050

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

API: Get refs for a particular commit

Closes #18014

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

Resolve ""Support private HTTPS urls for object storage""

Closes #4879

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

Add a security harness script

Closes #43220

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

Resolve "Diff file navigation shows renamed files as deleted"

Closes #42314

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

Update database_mysql.md to remove conflicting recommendation

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

In repositories where there are a lot of refs, the git info-refs endpoint can
take longer than one minute to return, by which time the upload-pack will fail
because the JWT token will be invalidated.

Closes #4881

CE upstream - 2018-02-14 00:24 UTC

Closes gitaly#998 and gitaly#999

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