CE upstream - 2018-03-05 09:26 UTC
Files to resolve:
-
@timzallmann Please resolve (UD) app/assets/javascripts/ide/components/commit_sidebar/list.vue
-
André Luís Please resolve (UD) app/assets/javascripts/ide/components/commit_sidebar/list_item.vue
-
@iamphill Please resolve (UD) app/assets/javascripts/ide/components/ide.vue
-
@rymai Please resolve (UD) app/assets/javascripts/ide/components/ide_context_bar.vue
-
@rymai Please resolve (UD) app/assets/javascripts/ide/components/ide_project_branches_tree.vue
-
@rymai Please resolve (UD) app/assets/javascripts/ide/components/ide_status_bar.vue
-
@iamphill Please resolve (UD) app/assets/javascripts/ide/components/new_dropdown/index.vue
-
@iamphill Please resolve (UD) app/assets/javascripts/ide/components/new_dropdown/upload.vue
-
@rymai Please resolve (UD) app/assets/javascripts/ide/components/repo_commit_section.vue
-
@rymai Please resolve (UD) app/assets/javascripts/ide/components/repo_edit_button.vue
-
@iamphill Please resolve (UD) app/assets/javascripts/ide/components/repo_editor.vue
-
@rymai Please resolve (UD) app/assets/javascripts/ide/components/repo_file.vue
-
@rymai Please resolve (UD) app/assets/javascripts/ide/components/repo_tab.vue
-
@timzallmann Please resolve (UD) app/assets/javascripts/ide/index.js
-
@rymai Please resolve (UD) app/assets/javascripts/ide/lib/common/model.js
-
@iamphill Please resolve (UD) app/assets/javascripts/ide/lib/common/model_manager.js
-
@iamphill Please resolve (UD) app/assets/javascripts/ide/lib/diff/controller.js
-
@iamphill Please resolve (UD) app/assets/javascripts/ide/lib/editor.js
-
@timzallmann Please resolve (UD) app/assets/javascripts/ide/lib/editor_options.js
-
@rymai Please resolve (UD) app/assets/javascripts/ide/stores/actions.js
-
@iamphill Please resolve (UD) app/assets/javascripts/ide/stores/actions/file.js
-
@iamphill Please resolve (UD) app/assets/javascripts/ide/stores/actions/tree.js
-
@iamphill Please resolve (UD) app/assets/javascripts/ide/stores/getters.js
-
@rymai Please resolve (UD) app/assets/javascripts/ide/stores/index.js
-
@iamphill Please resolve (UD) app/assets/javascripts/ide/stores/mutation_types.js
-
@iamphill Please resolve (UD) app/assets/javascripts/ide/stores/mutations.js
-
@iamphill Please resolve (UD) app/assets/javascripts/ide/stores/mutations/file.js
-
@iamphill Please resolve (UD) app/assets/javascripts/ide/stores/mutations/tree.js
-
@iamphill Please resolve (UD) app/assets/javascripts/ide/stores/state.js
-
@iamphill Please resolve (UD) app/assets/javascripts/ide/stores/utils.js
-
@iamphill Please resolve (UD) app/controllers/ide_controller.rb
-
@iamphill Please resolve (UU) app/helpers/application_helper.rb
-
@iamphill Please resolve (UU) app/helpers/blob_helper.rb
-
@timzallmann Please resolve (UD) app/views/ide/index.html.haml
-
@iamphill Please resolve (UU) app/views/projects/tree/_tree_header.html.haml
-
@iamphill Please resolve (UU) app/views/shared/_ref_switcher.html.haml
-
@timzallmann Please resolve (UD) spec/features/projects/tree/create_directory_spec.rb
-
@timzallmann Please resolve (UD) spec/features/projects/tree/create_file_spec.rb
-
@iamphill Please resolve (UD) spec/features/projects/tree/upload_file_spec.rb
-
@rymai Please resolve (UD) spec/javascripts/repo/components/commit_sidebar/list_collapsed_spec.js
-
André Luís Please resolve (UD) spec/javascripts/repo/components/commit_sidebar/list_item_spec.js
-
@rymai Please resolve (UD) spec/javascripts/repo/components/commit_sidebar/list_spec.js
-
@rymai Please resolve (UD) spec/javascripts/repo/components/ide_context_bar_spec.js
-
@rymai Please resolve (UD) spec/javascripts/repo/components/ide_spec.js
-
@rymai Please resolve (UD) spec/javascripts/repo/components/repo_commit_section_spec.js
-
@iamphill Please resolve (UD) spec/javascripts/repo/components/repo_edit_button_spec.js
-
@iamphill Please resolve (UD) spec/javascripts/repo/components/repo_editor_spec.js
-
@iamphill Please resolve (UD) spec/javascripts/repo/components/repo_file_spec.js
-
@iamphill Please resolve (UD) spec/javascripts/repo/components/repo_tab_spec.js
-
@rymai Please resolve (UD) spec/javascripts/repo/helpers.js
-
@iamphill Please resolve (UD) spec/javascripts/repo/lib/common/model_manager_spec.js
-
@iamphill Please resolve (UD) spec/javascripts/repo/lib/common/model_spec.js
-
@iamphill Please resolve (UD) spec/javascripts/repo/lib/diff/controller_spec.js
-
@timzallmann Please resolve (UD) spec/javascripts/repo/lib/editor_options_spec.js
-
@iamphill Please resolve (UD) spec/javascripts/repo/lib/editor_spec.js
-
@iamphill Please resolve (UD) spec/javascripts/repo/stores/actions/file_spec.js
-
@iamphill Please resolve (UD) spec/javascripts/repo/stores/actions/tree_spec.js
-
@iamphill Please resolve (UD) spec/javascripts/repo/stores/actions_spec.js
-
@iamphill Please resolve (UD) spec/javascripts/repo/stores/getters_spec.js
-
@iamphill Please resolve (UD) spec/javascripts/repo/stores/mutations/file_spec.js
-
@iamphill Please resolve (UD) spec/javascripts/repo/stores/mutations/tree_spec.js
-
@iamphill Please resolve (UD) spec/javascripts/repo/stores/mutations_spec.js
Try to resolve one file per commit, and then push (no force-push!) to the ce-to-ee-2018-03-05
branch.
Thanks in advance!
@iamphill 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!