# Conflicts:
#	Gemfile.rails5.lock
#	app/policies/concerns/policy_actor.rb
#	app/serializers/pipeline_serializer.rb
#	spec/javascripts/pipelines/graph/graph_component_spec.js
#	spec/javascripts/pipelines/graph/stage_column_component_spec.js
#	spec/serializers/pipeline_serializer_spec.rb

[ci skip]