# Conflicts:
#	app/assets/javascripts/boards/models/list.js
#	app/assets/javascripts/dispatcher.js
#	app/assets/javascripts/environments/components/environment_item.vue
#	app/assets/javascripts/environments/components/environments_table.vue
#	app/assets/javascripts/project_new.js
#	app/assets/stylesheets/framework/variables.scss
#	app/assets/stylesheets/pages/environments.scss
#	app/assets/stylesheets/pages/pipelines.scss
#	app/assets/stylesheets/pages/projects.scss
#	app/controllers/concerns/lfs_request.rb
#	app/controllers/projects/deploy_keys_controller.rb
#	app/controllers/projects/git_http_controller.rb
#	app/controllers/projects/imports_controller.rb
#	app/controllers/projects/protected_refs_controller.rb
#	app/controllers/sessions_controller.rb
#	app/helpers/button_helper.rb
#	app/helpers/dropdowns_helper.rb
#	app/models/ci/pipeline.rb
#	app/models/concerns/protected_ref.rb
#	app/models/project.rb
#	app/models/project_services/deployment_service.rb
#	app/policies/group_policy.rb
#	app/serializers/pipeline_details_entity.rb
#	app/serializers/pipeline_serializer.rb
#	app/services/boards/create_service.rb
#	app/services/ci/create_pipeline_service.rb
#	app/services/members/create_service.rb
#	app/services/slash_commands/interpret_service.rb
#	app/views/layouts/nav/_admin.html.haml
#	app/views/projects/commits/_head.html.haml
#	app/views/projects/issues/index.html.haml
#	app/views/projects/protected_tags/_index.html.haml
#	app/views/projects/settings/repository/show.html.haml
#	app/views/shared/issuable/_search_bar.html.haml
#	app/workers/repository_import_worker.rb
#	db/schema.rb
#	doc/ci/docker/using_docker_images.md
#	doc/ci/examples/code_climate.md
#	lib/api/groups.rb
#	lib/gitlab/checks/change_access.rb
#	lib/gitlab/git_access.rb
#	lib/gitlab/git_access_wiki.rb
#	lib/tasks/gitlab/check.rake
#	spec/db/production/settings.rb
#	spec/factories/projects.rb
#	spec/features/protected_branches_spec.rb
#	spec/lib/gitlab/git_access_spec.rb
#	spec/lib/gitlab/git_access_wiki_spec.rb
#	spec/lib/gitlab/import_export/all_models.yml
#	spec/models/forked_project_link_spec.rb
#	spec/models/project_spec.rb
#	spec/models/user_spec.rb
#	spec/requests/api/users_spec.rb
#	spec/serializers/pipeline_details_entity_spec.rb
#	spec/serializers/pipeline_serializer_spec.rb
#	spec/services/create_deployment_service_spec.rb
#	spec/services/projects/fork_service_spec.rb
#	spec/spec_helper.rb
[ci skip]