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

Closes gitlab-qa#148

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

Update Process document with changes to the exception request process.

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

clarify what kind of feature flags we support

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

[EE] Fix a too strict array-matching expectation

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

Fix a too strict array-matching expectation

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

Add clearer proofreader process to docs

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

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

Closes gitlab-ee#4914

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

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

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

Change all occurrences of ApplicationHelper#avatar_icon to use a User object where possible

Closes #42800

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

Remove ignore_column :data from Event

Closes #38135

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

Change SQL for expired artifacts to use new ci_job_artifacts.expire_at

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

Respect description and visibility when creating project from template

Closes #42601

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

# 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

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`.

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