CE upstream - 2018-07-07 03:21 UTC
Files to resolve:
-
@ClemMakesApps Please resolve (UU) app/assets/javascripts/vue_merge_request_widget/components/mr_widget_pipeline.vue
-
@ClemMakesApps Please resolve (UU) app/assets/stylesheets/framework/mixins.scss
-
@jameslopez Please resolve (UU) app/controllers/projects_controller.rb
-
@jameslopez Please resolve (UU) db/schema.rb
-
@jameslopez Please resolve (UU) spec/lib/gitlab/import_export/all_models.yml
Try to resolve one file per commit, and then push (no force-push!) to the ce-to-ee-2018-07-07
branch.
Thanks in advance!
@jameslopez 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 Stan Hu