CE upstream - 2018-01-26 12:23 UTC
Files to resolve:
-
@filipa Please resolve (AA) app/assets/javascripts/vue_merge_request_widget/components/states/mr_widget_merge_when_pipeline_succeeds.vue
-
@axil Please resolve (UU) config/gitlab.yml.example
-
@rymai Please resolve (UU) config/initializers/0_post_deployment_migrations.rb
Try to resolve one file per commit, and then push (no force-push!) to the ce-to-ee-2018-01-26
branch.
Thanks in advance!
@filipa 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 Rémy Coutable