# Conflicts:
#	Gemfile.lock
#	app/assets/javascripts/dispatcher.js
#	app/assets/stylesheets/framework/dropdowns.scss
#	app/assets/stylesheets/pages/issues.scss
#	app/assets/stylesheets/pages/projects.scss
#	app/helpers/appearances_helper.rb
#	app/models/ci/build.rb
#	app/services/boards/issues/list_service.rb
#	app/uploaders/job_artifact_uploader.rb
#	app/uploaders/legacy_artifact_uploader.rb
#	app/workers/post_receive.rb
#	app/workers/project_cache_worker.rb
#	doc/user/permissions.md
#	doc/user/project/merge_requests/index.md
#	lib/gitlab/sidekiq_config.rb
#	locale/gitlab.pot
#	spec/factories/appearances.rb
#	spec/factories/ci/job_artifacts.rb
#	spec/lib/gitlab/email/handler_spec.rb
#	spec/lib/gitlab/sidekiq_config_spec.rb
#	spec/migrations/migrate_gcp_clusters_to_new_clusters_architectures_spec.rb
#	spec/models/ci/build_spec.rb
#	spec/models/project_spec.rb
#	spec/serializers/pipeline_serializer_spec.rb
#	spec/uploaders/job_artifact_uploader_spec.rb
#	spec/uploaders/legacy_artifact_uploader_spec.rb

[ci skip]