CE upstream - Thursday

Files to resolve:

• @psimyn Please resolve https://gitlab.com/gitlab-org/gitlab-ee/blob/1996049b9eb52e199b809bdaeb47d103367a25c0/app/assets/javascripts/boards/models/list.js (UU)
• @mikegreiling Please resolve https://gitlab.com/gitlab-org/gitlab-ee/blob/1996049b9eb52e199b809bdaeb47d103367a25c0/app/assets/javascripts/dispatcher.js (UU)
• @annabeldunstone Please resolve https://gitlab.com/gitlab-org/gitlab-ee/blob/1996049b9eb52e199b809bdaeb47d103367a25c0/app/assets/javascripts/environments/components/environment_item.vue (UU)
• @annabeldunstone Please resolve https://gitlab.com/gitlab-org/gitlab-ee/blob/1996049b9eb52e199b809bdaeb47d103367a25c0/app/assets/javascripts/environments/components/environments_table.vue (UU)
• @mikegreiling Please resolve https://gitlab.com/gitlab-org/gitlab-ee/blob/1996049b9eb52e199b809bdaeb47d103367a25c0/app/assets/javascripts/project_new.js (UU)
• @mikegreiling Please resolve https://gitlab.com/gitlab-org/gitlab-ee/blob/1996049b9eb52e199b809bdaeb47d103367a25c0/app/assets/stylesheets/framework/variables.scss (UU)
• @annabeldunstone Please resolve https://gitlab.com/gitlab-org/gitlab-ee/blob/1996049b9eb52e199b809bdaeb47d103367a25c0/app/assets/stylesheets/pages/environments.scss (UU)
• @brycepj Please resolve https://gitlab.com/gitlab-org/gitlab-ee/blob/1996049b9eb52e199b809bdaeb47d103367a25c0/app/assets/stylesheets/pages/pipelines.scss (UU)
• @mikegreiling Please resolve https://gitlab.com/gitlab-org/gitlab-ee/blob/1996049b9eb52e199b809bdaeb47d103367a25c0/app/assets/stylesheets/pages/projects.scss (UU)
• @mkozono Please resolve https://gitlab.com/gitlab-org/gitlab-ee/blob/1996049b9eb52e199b809bdaeb47d103367a25c0/app/controllers/concerns/lfs_request.rb (UU)
• Alexander Randa Please resolve https://gitlab.com/gitlab-org/gitlab-ee/blob/1996049b9eb52e199b809bdaeb47d103367a25c0/app/controllers/projects/deploy_keys_controller.rb (UU)
• @mkozono Please resolve https://gitlab.com/gitlab-org/gitlab-ee/blob/1996049b9eb52e199b809bdaeb47d103367a25c0/app/controllers/projects/git_http_controller.rb (UU)
• @tiagonbotelho Please resolve https://gitlab.com/gitlab-org/gitlab-ee/blob/1996049b9eb52e199b809bdaeb47d103367a25c0/app/controllers/projects/imports_controller.rb (UU)
• @jamedjo Please resolve https://gitlab.com/gitlab-org/gitlab-ee/blob/1996049b9eb52e199b809bdaeb47d103367a25c0/app/controllers/projects/protected_refs_controller.rb (UU)
• Maxime Besson Please resolve https://gitlab.com/gitlab-org/gitlab-ee/blob/1996049b9eb52e199b809bdaeb47d103367a25c0/app/controllers/sessions_controller.rb (UU)
• @reprazent Please resolve https://gitlab.com/gitlab-org/gitlab-ee/blob/1996049b9eb52e199b809bdaeb47d103367a25c0/app/helpers/button_helper.rb (UU)
• @rymai Please resolve https://gitlab.com/gitlab-org/gitlab-ee/blob/1996049b9eb52e199b809bdaeb47d103367a25c0/app/helpers/dropdowns_helper.rb (UU)
• @ayufan Please resolve https://gitlab.com/gitlab-org/gitlab-ee/blob/1996049b9eb52e199b809bdaeb47d103367a25c0/app/models/ci/pipeline.rb (UU)
• @jamedjo Please resolve https://gitlab.com/gitlab-org/gitlab-ee/blob/1996049b9eb52e199b809bdaeb47d103367a25c0/app/models/concerns/protected_ref.rb (UU)
• @ayufan Please resolve https://gitlab.com/gitlab-org/gitlab-ee/blob/1996049b9eb52e199b809bdaeb47d103367a25c0/app/models/project.rb (UU)
• @jarka Please resolve https://gitlab.com/gitlab-org/gitlab-ee/blob/1996049b9eb52e199b809bdaeb47d103367a25c0/app/models/project_services/deployment_service.rb (UU)
• @smcgivern Please resolve https://gitlab.com/gitlab-org/gitlab-ee/blob/1996049b9eb52e199b809bdaeb47d103367a25c0/app/policies/group_policy.rb (UU)
• @ayufan Please resolve https://gitlab.com/gitlab-org/gitlab-ee/blob/1996049b9eb52e199b809bdaeb47d103367a25c0/app/serializers/pipeline_details_entity.rb (AA)
• @ayufan Please resolve https://gitlab.com/gitlab-org/gitlab-ee/blob/1996049b9eb52e199b809bdaeb47d103367a25c0/app/serializers/pipeline_serializer.rb (UU)
• @iamphill Please resolve https://gitlab.com/gitlab-org/gitlab-ee/blob/1996049b9eb52e199b809bdaeb47d103367a25c0/app/services/boards/create_service.rb (UU)
• @ayufan Please resolve https://gitlab.com/gitlab-org/gitlab-ee/blob/1996049b9eb52e199b809bdaeb47d103367a25c0/app/services/ci/create_pipeline_service.rb (UU)
• @nick.thomas Please resolve https://gitlab.com/gitlab-org/gitlab-ee/blob/1996049b9eb52e199b809bdaeb47d103367a25c0/app/services/members/create_service.rb (UU)
• @vsizov Please resolve https://gitlab.com/gitlab-org/gitlab-ee/blob/1996049b9eb52e199b809bdaeb47d103367a25c0/app/services/slash_commands/interpret_service.rb (UU)
• @jameslopez Please resolve https://gitlab.com/gitlab-org/gitlab-ee/blob/1996049b9eb52e199b809bdaeb47d103367a25c0/app/views/layouts/nav/_admin.html.haml (UU)
• @reprazent Please resolve https://gitlab.com/gitlab-org/gitlab-ee/blob/1996049b9eb52e199b809bdaeb47d103367a25c0/app/views/projects/commits/_head.html.haml (UU)
• @brycepj Please resolve https://gitlab.com/gitlab-org/gitlab-ee/blob/1996049b9eb52e199b809bdaeb47d103367a25c0/app/views/projects/issues/index.html.haml (UU)
• @mikegreiling Please resolve https://gitlab.com/gitlab-org/gitlab-ee/blob/1996049b9eb52e199b809bdaeb47d103367a25c0/app/views/projects/protected_tags/_index.html.haml (UU)
• @mikegreiling Please resolve https://gitlab.com/gitlab-org/gitlab-ee/blob/1996049b9eb52e199b809bdaeb47d103367a25c0/app/views/projects/settings/repository/show.html.haml (UU)
• @brycepj Please resolve https://gitlab.com/gitlab-org/gitlab-ee/blob/1996049b9eb52e199b809bdaeb47d103367a25c0/app/views/shared/issuable/_search_bar.html.haml (UU)
• @tiagonbotelho Please resolve https://gitlab.com/gitlab-org/gitlab-ee/blob/1996049b9eb52e199b809bdaeb47d103367a25c0/app/workers/repository_import_worker.rb (UU)
• Robin Bobbitt Please resolve https://gitlab.com/gitlab-org/gitlab-ee/blob/1996049b9eb52e199b809bdaeb47d103367a25c0/db/schema.rb (UU)
• @axil Please resolve https://gitlab.com/gitlab-org/gitlab-ee/blob/1996049b9eb52e199b809bdaeb47d103367a25c0/doc/ci/docker/using_docker_images.md (UU)
• @dzaporozhets Please resolve https://gitlab.com/gitlab-org/gitlab-ee/blob/1996049b9eb52e199b809bdaeb47d103367a25c0/doc/ci/examples/code_climate.md (UU)
• @godfat Please resolve https://gitlab.com/gitlab-org/gitlab-ee/blob/1996049b9eb52e199b809bdaeb47d103367a25c0/lib/api/groups.rb (UU)
• @mkozono Please resolve https://gitlab.com/gitlab-org/gitlab-ee/blob/1996049b9eb52e199b809bdaeb47d103367a25c0/lib/gitlab/checks/change_access.rb (UU)
• @mkozono Please resolve https://gitlab.com/gitlab-org/gitlab-ee/blob/1996049b9eb52e199b809bdaeb47d103367a25c0/lib/gitlab/git_access.rb (UU)
• @mkozono Please resolve https://gitlab.com/gitlab-org/gitlab-ee/blob/1996049b9eb52e199b809bdaeb47d103367a25c0/lib/gitlab/git_access_wiki.rb (UU)
• @brodock Please resolve https://gitlab.com/gitlab-org/gitlab-ee/blob/1996049b9eb52e199b809bdaeb47d103367a25c0/lib/tasks/gitlab/check.rake (UU)
• @brodock Please resolve https://gitlab.com/gitlab-org/gitlab-ee/blob/1996049b9eb52e199b809bdaeb47d103367a25c0/spec/db/production/settings.rb (UD)
• @tiagonbotelho Please resolve https://gitlab.com/gitlab-org/gitlab-ee/blob/1996049b9eb52e199b809bdaeb47d103367a25c0/spec/factories/projects.rb (UU)
• @mikegreiling Please resolve https://gitlab.com/gitlab-org/gitlab-ee/blob/1996049b9eb52e199b809bdaeb47d103367a25c0/spec/features/protected_branches_spec.rb (UU)
• @mkozono Please resolve https://gitlab.com/gitlab-org/gitlab-ee/blob/1996049b9eb52e199b809bdaeb47d103367a25c0/spec/lib/gitlab/git_access_spec.rb (UU)
• @mkozono Please resolve https://gitlab.com/gitlab-org/gitlab-ee/blob/1996049b9eb52e199b809bdaeb47d103367a25c0/spec/lib/gitlab/git_access_wiki_spec.rb (UU)
• @ayufan Please resolve https://gitlab.com/gitlab-org/gitlab-ee/blob/1996049b9eb52e199b809bdaeb47d103367a25c0/spec/lib/gitlab/import_export/all_models.yml (UU)
• @godfat Please resolve https://gitlab.com/gitlab-org/gitlab-ee/blob/1996049b9eb52e199b809bdaeb47d103367a25c0/spec/models/forked_project_link_spec.rb (UU)
• @ayufan Please resolve https://gitlab.com/gitlab-org/gitlab-ee/blob/1996049b9eb52e199b809bdaeb47d103367a25c0/spec/models/project_spec.rb (UU)
• @godfat Please resolve https://gitlab.com/gitlab-org/gitlab-ee/blob/1996049b9eb52e199b809bdaeb47d103367a25c0/spec/models/user_spec.rb (UU)
• @godfat Please resolve https://gitlab.com/gitlab-org/gitlab-ee/blob/1996049b9eb52e199b809bdaeb47d103367a25c0/spec/requests/api/users_spec.rb (UU)
• @ayufan Please resolve https://gitlab.com/gitlab-org/gitlab-ee/blob/1996049b9eb52e199b809bdaeb47d103367a25c0/spec/serializers/pipeline_details_entity_spec.rb (AA)
• @ayufan Please resolve https://gitlab.com/gitlab-org/gitlab-ee/blob/1996049b9eb52e199b809bdaeb47d103367a25c0/spec/serializers/pipeline_serializer_spec.rb (UU)
• @godfat Please resolve https://gitlab.com/gitlab-org/gitlab-ee/blob/1996049b9eb52e199b809bdaeb47d103367a25c0/spec/services/create_deployment_service_spec.rb (UU)
• @godfat Please resolve https://gitlab.com/gitlab-org/gitlab-ee/blob/1996049b9eb52e199b809bdaeb47d103367a25c0/spec/services/projects/fork_service_spec.rb (UU)
• @grzesiek Please resolve https://gitlab.com/gitlab-org/gitlab-ee/blob/1996049b9eb52e199b809bdaeb47d103367a25c0/spec/spec_helper.rb (UU)

Once the conflicts resolved, please push (no force-push!) to the ce-to-ee-2017-06-08 branch.

Thanks in advance! ❤️

Note: This merge request was created by an experimental script, it's not perfect (yet)!