CE upstream - Wednesday

Files to resolve:

• @balasankarc Please resolve https://gitlab.com/gitlab-org/gitlab-ee/blob/59d20d1a8d094b01fb5fbde0c1613457da105242/.gitlab-ci.yml (UU)
• @MadLittleMods Please resolve https://gitlab.com/gitlab-org/gitlab-ee/blob/59d20d1a8d094b01fb5fbde0c1613457da105242/app/assets/javascripts/boards/boards_bundle.js (UU)
• @MadLittleMods Please resolve https://gitlab.com/gitlab-org/gitlab-ee/blob/59d20d1a8d094b01fb5fbde0c1613457da105242/app/assets/javascripts/boards/filtered_search_boards.js (UU)
• @MadLittleMods Please resolve https://gitlab.com/gitlab-org/gitlab-ee/blob/59d20d1a8d094b01fb5fbde0c1613457da105242/app/assets/javascripts/dispatcher.js (UU)
• @lbennett Please resolve https://gitlab.com/gitlab-org/gitlab-ee/blob/59d20d1a8d094b01fb5fbde0c1613457da105242/app/assets/javascripts/vue_merge_request_widget/dependencies.js (UU)
• @ClemMakesApps Please resolve https://gitlab.com/gitlab-org/gitlab-ee/blob/59d20d1a8d094b01fb5fbde0c1613457da105242/app/controllers/autocomplete_controller.rb (UU)
• Alexander Randa Please resolve https://gitlab.com/gitlab-org/gitlab-ee/blob/59d20d1a8d094b01fb5fbde0c1613457da105242/app/models/hooks/service_hook.rb (UU)
• @to1ne Please resolve https://gitlab.com/gitlab-org/gitlab-ee/blob/59d20d1a8d094b01fb5fbde0c1613457da105242/app/models/project.rb (UU)
• @ayufan Please resolve https://gitlab.com/gitlab-org/gitlab-ee/blob/59d20d1a8d094b01fb5fbde0c1613457da105242/app/models/project_services/kubernetes_service.rb (UU)
• @to1ne Please resolve https://gitlab.com/gitlab-org/gitlab-ee/blob/59d20d1a8d094b01fb5fbde0c1613457da105242/app/models/user.rb (UU)
• @felipe_artur Please resolve https://gitlab.com/gitlab-org/gitlab-ee/blob/59d20d1a8d094b01fb5fbde0c1613457da105242/app/services/ci/create_pipeline_service.rb (UU)
• @jameslopez Please resolve https://gitlab.com/gitlab-org/gitlab-ee/blob/59d20d1a8d094b01fb5fbde0c1613457da105242/app/views/layouts/nav/_admin.html.haml (UU)
• Alexander Randa Please resolve https://gitlab.com/gitlab-org/gitlab-ee/blob/59d20d1a8d094b01fb5fbde0c1613457da105242/app/views/projects/hooks/edit.html.haml (UU)
• @brycepj Please resolve https://gitlab.com/gitlab-org/gitlab-ee/blob/59d20d1a8d094b01fb5fbde0c1613457da105242/app/views/shared/issuable/form/_merge_params.html.haml (UU)
• @jacobvosmaer-gitlab Please resolve https://gitlab.com/gitlab-org/gitlab-ee/blob/59d20d1a8d094b01fb5fbde0c1613457da105242/config/initializers/1_settings.rb (UU)
• @DouweM Please resolve https://gitlab.com/gitlab-org/gitlab-ee/blob/59d20d1a8d094b01fb5fbde0c1613457da105242/config/routes/group.rb (UU)
• @vsizov Please resolve https://gitlab.com/gitlab-org/gitlab-ee/blob/59d20d1a8d094b01fb5fbde0c1613457da105242/db/schema.rb (UU)
• vanadium23 Please resolve https://gitlab.com/gitlab-org/gitlab-ee/blob/59d20d1a8d094b01fb5fbde0c1613457da105242/doc/api/projects.md (UU)
• @ClemMakesApps Please resolve https://gitlab.com/gitlab-org/gitlab-ee/blob/59d20d1a8d094b01fb5fbde0c1613457da105242/spec/controllers/autocomplete_controller_spec.rb (UU)
• @DouweM Please resolve https://gitlab.com/gitlab-org/gitlab-ee/blob/59d20d1a8d094b01fb5fbde0c1613457da105242/spec/features/issues/form_spec.rb (UU)
• @oswaldo Please resolve https://gitlab.com/gitlab-org/gitlab-ee/blob/59d20d1a8d094b01fb5fbde0c1613457da105242/spec/fixtures/api/schemas/entities/merge_request.json (UU)
• @jarka Please resolve https://gitlab.com/gitlab-org/gitlab-ee/blob/59d20d1a8d094b01fb5fbde0c1613457da105242/spec/models/project_services/jira_service_spec.rb (UU)
• @ayufan Please resolve https://gitlab.com/gitlab-org/gitlab-ee/blob/59d20d1a8d094b01fb5fbde0c1613457da105242/spec/models/project_services/kubernetes_service_spec.rb (UU)
• @to1ne Please resolve https://gitlab.com/gitlab-org/gitlab-ee/blob/59d20d1a8d094b01fb5fbde0c1613457da105242/spec/models/project_spec.rb (UU)
• @jarka Please resolve https://gitlab.com/gitlab-org/gitlab-ee/blob/59d20d1a8d094b01fb5fbde0c1613457da105242/spec/services/git_push_service_spec.rb (UU)

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

Thanks in advance! ❤️

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