# Conflicts:
#	app/assets/stylesheets/framework/panels.scss
#	app/assets/stylesheets/pages/boards.scss
#	app/assets/stylesheets/pages/issues.scss
#	app/assets/stylesheets/pages/pipelines.scss
#	app/models/application_setting.rb
#	app/models/ci/build.rb
#	app/models/project_services/kubernetes_service.rb
#	app/serializers/group_entity.rb
#	app/services/git_push_service.rb
#	app/services/git_tag_push_service.rb
#	app/views/help/index.html.haml
#	app/views/layouts/_broadcast.html.haml
#	app/views/projects/boards/components/_board.html.haml
#	app/views/projects/jobs/_sidebar.html.haml
#	app/views/shared/issuable/form/_merge_params.html.haml
#	config/sidekiq_queues.yml
#	db/schema.rb
#	doc/api/README.md
#	doc/api/projects.md
#	doc/ci/examples/code_climate.md
#	rubocop/cop/rspec/single_line_hook.rb
#	spec/controllers/projects/jobs_controller_spec.rb
#	spec/features/help_pages_spec.rb
#	spec/features/projects/jobs_spec.rb
#	spec/features/protected_branches_spec.rb
#	spec/features/protected_tags_spec.rb
#	spec/lib/gitlab/database/migration_helpers_spec.rb
#	spec/lib/gitlab/git_access_spec.rb
#	spec/lib/gitlab/kubernetes_spec.rb
#	spec/lib/gitlab/saml/user_spec.rb
#	spec/models/project_services/kubernetes_service_spec.rb
#	spec/policies/project_snippet_policy_spec.rb
#	spec/requests/api/jobs_spec.rb
#	spec/requests/api/runner_spec.rb
#	spec/requests/api/settings_spec.rb
#	spec/requests/ci/api/builds_spec.rb
#	spec/rubocop/cop/rspec/single_line_hook_spec.rb
#	spec/serializers/pipeline_serializer_spec.rb
#	spec/services/merge_requests/update_service_spec.rb
#	spec/support/kubernetes_helpers.rb
#	spec/uploaders/artifact_uploader_spec.rb
[ci skip]