CE upstream - 2018-02-27 08:08 UTC
Files to resolve:
-
@rymai Please resolve (UU) app/assets/javascripts/boards/components/board_new_issue.vue
-
@rymai Please resolve (UU) app/assets/javascripts/boards/index.js
-
@rymai Please resolve (UU) app/assets/javascripts/boards/stores/boards_store.js
-
@rymai Please resolve (UU) app/assets/javascripts/environments/components/environments_table.vue
-
@rymai Please resolve (UU) app/assets/javascripts/ide/components/repo_file.vue
-
@rymai Please resolve (UU) app/assets/javascripts/ide/components/repo_tab.vue
-
@rymai Please resolve (UU) app/assets/javascripts/vue_merge_request_widget/components/mr_widget_pipeline.vue
-
@stanhu Please resolve (UU) config/webpack.config.js
-
@rymai Please resolve (UU) spec/javascripts/environments/environment_table_spec.js
-
@rymai Please resolve (UU) spec/javascripts/repo/components/repo_commit_section_spec.js
-
@rymai Please resolve (UU) spec/javascripts/vue_mr_widget/components/mr_widget_pipeline_spec.js
Try to resolve one file per commit, and then push (no force-push!) to the ce-to-ee-2018-02-27
branch.
Thanks in advance!
@rymai 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