# Conflicts:
#	app/assets/stylesheets/framework.scss
#	lib/api/search.rb
#	spec/requests/api/search_spec.rb

[ci skip]

EE Port of "API - fix searching in group/project specified by path"

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

Update jquery.waitforimages & use npm version

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

GitLab QA: Add GITLAB_USER_TYPE to support different login types (e.g. standard, LDAP)

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

Restore changed file status in IDE

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

Resolve "Add tooltip in enviroments names"

Closes #42922

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

Rename .scss files to use snake_case

Closes #42908

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

Rename .scss files to use snake_case -- EE merge edition

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

API - fix searching in group/project specified by path

Closes #42937

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

See https://gitlab.com/gitlab-org/gitlab-ce/issues/42908

Conflicts:
	app/assets/stylesheets/framework.scss

GITLAB_USERNAME and GITLAB_PASSWORD may be specified for an LDAP login, but QA
scenarios may need to know which type it is in order to log in successfully.

# 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