CE upstream - Friday
Files to resolve:
-
@MadLittleMods Please resolve https://gitlab.com/gitlab-org/gitlab-ee/blob/d9cdb23a26389c916b70ba2056091086429e44b4/app/assets/stylesheets/framework/panels.scss (UU) -
@MadLittleMods Please resolve https://gitlab.com/gitlab-org/gitlab-ee/blob/d9cdb23a26389c916b70ba2056091086429e44b4/app/assets/stylesheets/pages/boards.scss (UU) -
@MadLittleMods Please resolve https://gitlab.com/gitlab-org/gitlab-ee/blob/d9cdb23a26389c916b70ba2056091086429e44b4/app/assets/stylesheets/pages/issues.scss (UU) -
@annabeldunstone Please resolve https://gitlab.com/gitlab-org/gitlab-ee/blob/d9cdb23a26389c916b70ba2056091086429e44b4/app/assets/stylesheets/pages/pipelines.scss (UU) -
Robin Bobbitt Please resolve https://gitlab.com/gitlab-org/gitlab-ee/blob/d9cdb23a26389c916b70ba2056091086429e44b4/app/models/application_setting.rb (UU) -
@ayufan Please resolve https://gitlab.com/gitlab-org/gitlab-ee/blob/d9cdb23a26389c916b70ba2056091086429e44b4/app/models/ci/build.rb (UU) -
@nick.thomas Please resolve https://gitlab.com/gitlab-org/gitlab-ee/blob/d9cdb23a26389c916b70ba2056091086429e44b4/app/models/project_services/kubernetes_service.rb (UU) -
@alfredo1 Please resolve https://gitlab.com/gitlab-org/gitlab-ee/blob/d9cdb23a26389c916b70ba2056091086429e44b4/app/serializers/group_entity.rb (UU) -
@ayufan Please resolve https://gitlab.com/gitlab-org/gitlab-ee/blob/d9cdb23a26389c916b70ba2056091086429e44b4/app/services/git_push_service.rb (UU) -
@ayufan Please resolve https://gitlab.com/gitlab-org/gitlab-ee/blob/d9cdb23a26389c916b70ba2056091086429e44b4/app/services/git_tag_push_service.rb (UU) -
Robin Bobbitt Please resolve https://gitlab.com/gitlab-org/gitlab-ee/blob/d9cdb23a26389c916b70ba2056091086429e44b4/app/views/help/index.html.haml (UU) -
Mike Ricketts Please resolve https://gitlab.com/gitlab-org/gitlab-ee/blob/d9cdb23a26389c916b70ba2056091086429e44b4/app/views/layouts/_broadcast.html.haml (UU) -
@MadLittleMods Please resolve https://gitlab.com/gitlab-org/gitlab-ee/blob/d9cdb23a26389c916b70ba2056091086429e44b4/app/views/projects/boards/components/_board.html.haml (UU) -
@filipa Please resolve https://gitlab.com/gitlab-org/gitlab-ee/blob/d9cdb23a26389c916b70ba2056091086429e44b4/app/views/projects/jobs/_sidebar.html.haml (UU) -
@lbennett Please resolve https://gitlab.com/gitlab-org/gitlab-ee/blob/d9cdb23a26389c916b70ba2056091086429e44b4/app/views/shared/issuable/form/_merge_params.html.haml (UU) -
@yorickpeterse Please resolve https://gitlab.com/gitlab-org/gitlab-ee/blob/d9cdb23a26389c916b70ba2056091086429e44b4/config/sidekiq_queues.yml (UU) -
@smcgivern Please resolve https://gitlab.com/gitlab-org/gitlab-ee/blob/d9cdb23a26389c916b70ba2056091086429e44b4/db/schema.rb (UU) -
@axil Please resolve https://gitlab.com/gitlab-org/gitlab-ee/blob/d9cdb23a26389c916b70ba2056091086429e44b4/doc/api/README.md (UU) -
vanadium23 Please resolve https://gitlab.com/gitlab-org/gitlab-ee/blob/d9cdb23a26389c916b70ba2056091086429e44b4/doc/api/projects.md (UU) -
@axil Please resolve https://gitlab.com/gitlab-org/gitlab-ee/blob/d9cdb23a26389c916b70ba2056091086429e44b4/doc/ci/examples/code_climate.md (UU) -
@rspeicher Please resolve https://gitlab.com/gitlab-org/gitlab-ee/blob/d9cdb23a26389c916b70ba2056091086429e44b4/rubocop/cop/rspec/single_line_hook.rb (AA) -
@ayufan Please resolve https://gitlab.com/gitlab-org/gitlab-ee/blob/d9cdb23a26389c916b70ba2056091086429e44b4/spec/controllers/projects/jobs_controller_spec.rb (UU) -
Robin Bobbitt Please resolve https://gitlab.com/gitlab-org/gitlab-ee/blob/d9cdb23a26389c916b70ba2056091086429e44b4/spec/features/help_pages_spec.rb (UU) -
@godfat Please resolve https://gitlab.com/gitlab-org/gitlab-ee/blob/d9cdb23a26389c916b70ba2056091086429e44b4/spec/features/projects/jobs_spec.rb (UU) -
@rspeicher Please resolve https://gitlab.com/gitlab-org/gitlab-ee/blob/d9cdb23a26389c916b70ba2056091086429e44b4/spec/features/protected_branches_spec.rb (UU) -
@rspeicher Please resolve https://gitlab.com/gitlab-org/gitlab-ee/blob/d9cdb23a26389c916b70ba2056091086429e44b4/spec/features/protected_tags_spec.rb (UU) -
@rspeicher Please resolve https://gitlab.com/gitlab-org/gitlab-ee/blob/d9cdb23a26389c916b70ba2056091086429e44b4/spec/lib/gitlab/database/migration_helpers_spec.rb (UU) -
@rspeicher Please resolve https://gitlab.com/gitlab-org/gitlab-ee/blob/d9cdb23a26389c916b70ba2056091086429e44b4/spec/lib/gitlab/git_access_spec.rb (UU) -
@nick.thomas Please resolve https://gitlab.com/gitlab-org/gitlab-ee/blob/d9cdb23a26389c916b70ba2056091086429e44b4/spec/lib/gitlab/kubernetes_spec.rb (UU) -
@rspeicher Please resolve https://gitlab.com/gitlab-org/gitlab-ee/blob/d9cdb23a26389c916b70ba2056091086429e44b4/spec/lib/gitlab/saml/user_spec.rb (UU) -
@rspeicher Please resolve https://gitlab.com/gitlab-org/gitlab-ee/blob/d9cdb23a26389c916b70ba2056091086429e44b4/spec/models/project_services/kubernetes_service_spec.rb (UU) -
@rspeicher Please resolve https://gitlab.com/gitlab-org/gitlab-ee/blob/d9cdb23a26389c916b70ba2056091086429e44b4/spec/policies/project_snippet_policy_spec.rb (UU) -
@godfat Please resolve https://gitlab.com/gitlab-org/gitlab-ee/blob/d9cdb23a26389c916b70ba2056091086429e44b4/spec/requests/api/jobs_spec.rb (UU) -
@rspeicher Please resolve https://gitlab.com/gitlab-org/gitlab-ee/blob/d9cdb23a26389c916b70ba2056091086429e44b4/spec/requests/api/runner_spec.rb (UU) -
Robin Bobbitt Please resolve https://gitlab.com/gitlab-org/gitlab-ee/blob/d9cdb23a26389c916b70ba2056091086429e44b4/spec/requests/api/settings_spec.rb (UU) -
@rspeicher Please resolve https://gitlab.com/gitlab-org/gitlab-ee/blob/d9cdb23a26389c916b70ba2056091086429e44b4/spec/requests/ci/api/builds_spec.rb (UU) -
@rspeicher Please resolve https://gitlab.com/gitlab-org/gitlab-ee/blob/d9cdb23a26389c916b70ba2056091086429e44b4/spec/rubocop/cop/rspec/single_line_hook_spec.rb (AA) -
@rspeicher Please resolve https://gitlab.com/gitlab-org/gitlab-ee/blob/d9cdb23a26389c916b70ba2056091086429e44b4/spec/serializers/pipeline_serializer_spec.rb (UU) -
@rspeicher Please resolve https://gitlab.com/gitlab-org/gitlab-ee/blob/d9cdb23a26389c916b70ba2056091086429e44b4/spec/services/merge_requests/update_service_spec.rb (UU) -
@nick.thomas Please resolve https://gitlab.com/gitlab-org/gitlab-ee/blob/d9cdb23a26389c916b70ba2056091086429e44b4/spec/support/kubernetes_helpers.rb (UU) -
@ayufan Please resolve https://gitlab.com/gitlab-org/gitlab-ee/blob/d9cdb23a26389c916b70ba2056091086429e44b4/spec/uploaders/artifact_uploader_spec.rb (UU)
Once the conflicts resolved, please push (no force-push!) to the ce-to-ee-2017-06-16
branch.
Thanks in advance!
Note: This merge request was created by an experimental script, it's not perfect (yet)!