Merge branch '4471-member-and-group-lock-enabled-allows-project-to-be-shared-10-5' into 'security-10-5-ee'

[10.5] Project can no longer be shared between groups when both member and group lock are active.

See merge request gitlab/gitlab-ee!597

[ci skip]

[ci skip]

[ci skip]

[ci skip]

[ci skip]

[ci skip]

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

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

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

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

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

Closes #5049

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

De-revert filtered_search webpack changes

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

# 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

Cleanup webpack config

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

Resolve "Allow API method /projects/:id/repository/commits  to work over all commits"

Closes #42434

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

CE upstream - 2018-03-01 00:35 UTC

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

Pipeline variables expressions

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

Resolve "Tooltip for the stop pipeline button is 'Cancel'"

Closes #42946

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

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

Encode revision for gitattributes ref

Closes gitaly#1032 and #43278

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