CE Upstream - Tuesday
-
@winh please resolve https://gitlab.com/gitlab-org/gitlab-ee/blob/ce-to-ee/app/assets/stylesheets/framework/selects.scss -
@MadLittleMods please resolve https://gitlab.com/gitlab-org/gitlab-ee/blob/ce-to-ee/app/assets/stylesheets/pages/merge_requests.scss -
@winh please resolve https://gitlab.com/gitlab-org/gitlab-ee/blob/ce-to-ee/app/assets/stylesheets/pages/projects.scss -
@MadLittleMods please resolve https://gitlab.com/gitlab-org/gitlab-ee/blob/ce-to-ee/app/controllers/projects/issues_controller.rb -
@nick.thomas please resolve https://gitlab.com/gitlab-org/gitlab-ee/blob/ce-to-ee/app/helpers/form_helper.rb -
@MadLittleMods please resolve https://gitlab.com/gitlab-org/gitlab-ee/blob/ce-to-ee/app/helpers/issuables_helper.rb -
@ayufan please resolve https://gitlab.com/gitlab-org/gitlab-ee/blob/ce-to-ee/app/models/ci/build.rb -
@nick.thomas please resolve https://gitlab.com/gitlab-org/gitlab-ee/blob/ce-to-ee/app/models/key.rb -
@jarka please resolve https://gitlab.com/gitlab-org/gitlab-ee/blob/ce-to-ee/app/serializers/issue_entity.rb -
@nick.thomas please resolve https://gitlab.com/gitlab-org/gitlab-ee/blob/ce-to-ee/app/views/admin/application_settings/_form.html.haml -
@MadLittleMods please resolve https://gitlab.com/gitlab-org/gitlab-ee/blob/ce-to-ee/app/views/shared/issuable/_form.html.haml -
@dosuken123 please resolve https://gitlab.com/gitlab-org/gitlab-ee/blob/ce-to-ee/db/schema.rb -
Hiroyuki Sato please resolve https://gitlab.com/gitlab-org/gitlab-ee/blob/ce-to-ee/doc/api/issues.md -
@nick.thomas please resolve https://gitlab.com/gitlab-org/gitlab-ee/blob/ce-to-ee/doc/api/settings.md -
@ayufan please resolve https://gitlab.com/gitlab-org/gitlab-ee/blob/ce-to-ee/lib/api/entities.rb -
@nick.thomas please resolve https://gitlab.com/gitlab-org/gitlab-ee/blob/ce-to-ee/lib/api/settings.rb -
@reprazent please resolve https://gitlab.com/gitlab-org/gitlab-ee/blob/ce-to-ee/lib/gitlab/utils.rb -
@MadLittleMods please resolve https://gitlab.com/gitlab-org/gitlab-ee/blob/ce-to-ee/spec/controllers/autocomplete_controller_spec.rb -
@MadLittleMods please resolve https://gitlab.com/gitlab-org/gitlab-ee/blob/ce-to-ee/spec/javascripts/issue_show/components/app_spec.js -
@MadLittleMods please resolve https://gitlab.com/gitlab-org/gitlab-ee/blob/ce-to-ee/spec/javascripts/issue_show/components/form_spec.js -
@dosuken123 please resolve https://gitlab.com/gitlab-org/gitlab-ee/blob/ce-to-ee/spec/lib/gitlab/import_export/safe_model_attributes.yml -
@reprazent please resolve https://gitlab.com/gitlab-org/gitlab-ee/blob/ce-to-ee/spec/lib/gitlab/utils_spec.rb -
@grzesiek please resolve https://gitlab.com/gitlab-org/gitlab-ee/blob/ce-to-ee/spec/mailers/notify_spec.rb -
@nick.thomas please resolve https://gitlab.com/gitlab-org/gitlab-ee/blob/ce-to-ee/spec/models/application_setting_spec.rb -
@dosuken123 please resolve https://gitlab.com/gitlab-org/gitlab-ee/blob/ce-to-ee/spec/services/ci/retry_build_service_spec.rb -
@brodock please resolve https://gitlab.com/gitlab-org/gitlab-ee/blob/ce-to-ee/spec/services/projects/update_service_spec.rb
Once the conflicts resolved, please push (no force-push!) to the ce-to-ee
branch.
People mentioned here are picked by git log -1 -- FILENAME
. If you are wrong person to resolve the conflict - please ping me.
Thanks for help!