# Conflicts:
#	lib/gitlab/access.rb
#	spec/features/boards/sidebar_spec.rb
#	spec/features/issues/form_spec.rb
#	spec/features/projects/merge_requests/user_creates_merge_request_spec.rb
#	spec/javascripts/fixtures/projects.rb
#	spec/requests/api/protected_branches_spec.rb

[ci skip]