CE upstream - 2018-06-13 18:22 UTC
Files to resolve:
-
@filipa Please resolve (UU) app/assets/javascripts/boards/components/board_sidebar.js
-
@filipa Please resolve (UU) app/assets/javascripts/boards/components/issue_card_inner.js
-
@filipa Please resolve (UU) app/assets/javascripts/ide/components/repo_commit_section.vue
-
@filipa Please resolve (UU) app/assets/javascripts/merge_conflicts/components/inline_conflict_lines.js
-
@filipa Please resolve (UU) app/assets/javascripts/merge_conflicts/components/parallel_conflict_lines.js
-
@filipa Please resolve (UU) app/assets/javascripts/pipelines/components/graph/stage_column_component.vue
-
@filipa Please resolve (UU) app/assets/javascripts/sidebar/components/time_tracking/comparison_pane.vue
-
@filipa Please resolve (UU) app/assets/javascripts/vue_merge_request_widget/components/mr_widget_pipeline.vue
-
@filipa Please resolve (UU) app/assets/javascripts/vue_shared/components/sidebar/labels_select/dropdown_value_collapsed.vue
-
@filipa Please resolve (UU) app/assets/javascripts/vue_shared/components/sidebar/toggle_sidebar.vue
-
@filipa Please resolve (UU) app/assets/javascripts/vue_shared/components/user_avatar/user_avatar_image.vue
-
@victorwu Please resolve (UU) doc/user/project/issue_board.md
-
Jan Please resolve (UU) doc/user/project/quick_actions.md
-
Jan Please resolve (UU) spec/services/quick_actions/interpret_service_spec.rb
Try to resolve one file per commit, and then push (no force-push!) to the ce-to-ee-2018-06-13
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 Filipa Lacerda