CE upstream - 2018-11-21 02:21 UTC
Files to resolve:
-
@mikegreiling Please resolve (UU) app/assets/javascripts/environments/components/environment_item.vue -
@mikegreiling Please resolve (UU) app/assets/javascripts/environments/components/environments_table.vue -
@mikegreiling Please resolve (UU) app/assets/javascripts/monitoring/components/dashboard.vue -
@mikegreiling Please resolve (UU) app/assets/javascripts/monitoring/components/graph/flag.vue -
@mikegreiling Please resolve (UU) app/assets/javascripts/notes/components/note_form.vue -
@mikegreiling Please resolve (UU) app/assets/javascripts/pipelines/components/graph/graph_component.vue -
@mikegreiling Please resolve (UU) app/assets/javascripts/vue_merge_request_widget/components/mr_widget_pipeline.vue -
@mikegreiling Please resolve (UU) app/assets/javascripts/vue_shared/components/sidebar/date_picker.vue -
@gtsiolis Please resolve (UU) app/views/repository_check_mailer/notify.html.haml -
@gtsiolis Please resolve (UU) app/views/repository_check_mailer/notify.text.haml
Try to resolve one file per commit, and then push (no force-push!) to the ce-to-ee-2018-11-21 branch.
Thanks in advance!
@mikegreiling After you resolved the conflicts, please assign to the next person. If you're the last one to resolve the conflicts, please push this to be merged.
Note: This merge request was created by an automated script. Please report any issue at https://gitlab.com/gitlab-org/release-tools/issues!
Edited by George Tsiolis