# 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

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

[EE port] Resolve "Build Is Red: Admin > Users > Impersonation Tokens token creation allows creation of a token"

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

And use :migration tag to use deletion strategy, and to avoid caching tables, and to lock into a particular schema.

Attempting to fix intermittent spec errors `PG::UndefinedTable: ERROR:  relation "public.untracked_files_for_uploads" does not exist`.

CE upstream - 2018-02-13 15:25 UTC

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

Replace $.ajax with axios in mirror pull

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

Replace $.post with axios in initPathLocks

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

Resolve "Geo: If repo was set to be redownloaded once it will be redownloaded always"

Closes #4919

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

Resolve "Background upload option is not effective"

Closes #4915

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

Remove unnecessary weightSelect from initLegacyFilters

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