CE upstream - 2018-02-27 22:10 UTC

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

Move Assignees vue component

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

content is the same as init_merge_request_show.js

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

Port of "Remove merge_conflicts bundle" to EE

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

Issue - fix order_weight_desc so null weights are placed at the end

Closes #1674

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

MR Notes Refactor

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

Resolve "ee-files-location-check bug for non-'gitlab-org' repo-based MRs"

Closes #5063

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

EE profile bundle tag refactor

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

Remove snippet bundle webpack entry point (EE)

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

# Conflicts:
#	app/services/members/approve_access_request_service.rb
#	app/services/members/create_service.rb
#	app/services/members/destroy_service.rb
#	app/services/members/update_service.rb
#	app/views/projects/merge_requests/show.html.haml
#	config/webpack.config.js

[ci skip]

Fix webpack.config.js syntax error from trailing comma

Closes #43669

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

Remove snippet bundle webpack entry point

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

removed profile webpack bundle tag

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

Remove sidebar bundle webpack entry point (EE)

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

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