# Conflicts:
#	app/helpers/auth_helper.rb
#	lib/gitlab/auth/ldap/access.rb
#	lib/gitlab/auth/ldap/adapter.rb
#	lib/gitlab/auth/ldap/config.rb
#	lib/gitlab/auth/ldap/person.rb
#	lib/gitlab/auth/ldap/user.rb
#	lib/gitlab/auth/o_auth/auth_hash.rb
#	lib/gitlab/auth/o_auth/user.rb
#	lib/gitlab/auth/saml/config.rb
#	lib/gitlab/auth/saml/user.rb
#	spec/lib/gitlab/auth/ldap/access_spec.rb
#	spec/lib/gitlab/auth/ldap/user_spec.rb
#	spec/support/ldap_helpers.rb

[ci skip]

Small fixes in Vuex docs

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

CE upstream - 2018-03-01 16:38 UTC

Closes gitaly#1032 and gitlab-ce#43278

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

Port of "Remove blob viewer bundles"

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

Remove u2f webpack bundle

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

Remove blob viewer bundles

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

Resolve "Extract API entities EE extensions to a separate `ee/lib/ee/api/entities.rb` file"

Closes #4812

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

Moved o_auth/saml/ldap modules under gitlab/auth

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

[EE] Moved o_auth/saml/ldap modules under gitlab/auth

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

Resolve "Include cycle time in usage ping"

Closes #41777

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

Resolve "`RepositoryRemoveRemoteWorker.perform_async` being called from transaction"

Closes #5049

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

Display ingress IP address in the Kubernetes page

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

Client implementation for Licensee#key

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

De-revert filtered_search webpack changes

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

Resolve "Have mailto: link in "Email a new issue to this project""

Closes #30665

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

Remove unnecessary chunks from common_vue

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

# Conflicts:
#	app/assets/javascripts/boards/filtered_search_boards.js
#	app/assets/javascripts/filtered_search/filtered_search_dropdown_manager.js
#	app/assets/javascripts/pages/projects/issues/show.js
#	app/assets/javascripts/pages/projects/merge_requests/init_merge_request_show.js
#	app/assets/javascripts/pages/search/init_filtered_search.js
#	app/finders/merge_requests_finder.rb
#	config/sidekiq_queues.yml

[ci skip]

Removing the two factor check when the user sets a new password

Closes #28141

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

Make project#namespace_id not null

Closes #26052

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