CE upstream - 2018-10-17 09:21 UTC
Files to resolve:
-
Johann Hubert Sonntagbauer Please resolve (UU) spec/javascripts/environments/environments_store_spec.js
-
Johann Hubert Sonntagbauer Please resolve (UU) spec/javascripts/vue_shared/components/sidebar/collapsed_grouped_date_picker_spec.js
-
Johann Hubert Sonntagbauer Please resolve (UU) spec/javascripts/vue_shared/components/sidebar/date_picker_spec.js
-
Johann Hubert Sonntagbauer Please resolve (UU) spec/javascripts/vue_shared/components/sidebar/labels_select/dropdown_value_collapsed_spec.js
Try to resolve one file per commit, and then push (no force-push!) to the ce-to-ee-2018-10-17
branch.
Thanks in advance!
@dzaporozhets 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 Mike Greiling