# Conflicts:
#	lib/api/search.rb
#	spec/requests/api/search_spec.rb

CE upstream - 2018-02-10 00:30 UTC

Closes gitlab-development-kit#321

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

Return a warning string if we try to encode to unsupported encoding

Closes gitlab-development-kit#321

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

[EE] Pick 10.4.3 fixes into master

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

Remove confirmation_input component

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

Fixes gitlab-development-kit#321

Pick 10.4.3 fixes into master

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

Fix using wildcards in protected tags to expose protected variables

[10.4] Fix GH namespace security issue

Restrict Todo API mark_as_done endpoint to the user's todos only

Restrict LDAP API to admins only - 10.4 port

[10.4] Fix stored XSS in code blocks

Merge branch 'security-10-4-25223-snippets-finder-doesnt-obey-feature-visibility' into 'security-10-4'

[Port for security-10-4]: Makes SnippetFinder ensure feature visibility

CE upstream - 2018-02-09 18:24 UTC

Closes gitlab-qa#180

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

Fix using wildcards in protected tags to expose protected variables

[10.4] Fix GH namespace security issue

Restrict Todo API mark_as_done endpoint to the user's todos only

[10.4] Fix stored XSS in code blocks

Merge branch 'security-10-4-25223-snippets-finder-doesnt-obey-feature-visibility' into 'security-10-4'

[Port for security-10-4]: Makes SnippetFinder ensure feature visibility

Improve docs about allowing some side effects on the constructor

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

Add documentation on how to build a QA Docker image

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

Resolve "Update SAST doc and example"

Closes #4845

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

Fix incorrect role name in mirroring error

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

Resolve "EE-only js for project edit page"

Closes #4610

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

Do not attach runner to a non-exsiting network in QA

Closes gitlab-qa#180

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

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

Closes gitlab-qa#180

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