# Conflicts:
#	app/assets/javascripts/vue_merge_request_widget/dependencies.js
#	config/webpack.config.js
#	doc/api/namespaces.md
#	lib/gitlab/git_access.rb
#	lib/gitlab/ldap/config.rb

[ci skip]