CE upstream - 2018-03-05 12:25 UTC
Files to resolve:
-
@iamphill Please resolve (UU) app/views/projects/blob/_header.html.haml
-
@iamphill Please resolve (UU) app/views/projects/tree/_tree_header.html.haml
-
@iamphill Please resolve (AU) ee/app/assets/javascripts/ide/components/commit_sidebar/list.vue
-
@iamphill Please resolve (AU) ee/app/assets/javascripts/ide/components/commit_sidebar/list_collapsed.vue
-
@iamphill Please resolve (AU) ee/app/assets/javascripts/ide/components/ide.vue
-
@iamphill Please resolve (AU) ee/app/assets/javascripts/ide/components/ide_context_bar.vue
-
@iamphill Please resolve (AU) ee/app/assets/javascripts/ide/components/ide_project_branches_tree.vue
-
@iamphill Please resolve (AU) ee/app/assets/javascripts/ide/components/ide_project_tree.vue
-
@iamphill Please resolve (AU) ee/app/assets/javascripts/ide/components/ide_repo_tree.vue
-
@iamphill Please resolve (AU) ee/app/assets/javascripts/ide/components/ide_side_bar.vue
-
@iamphill Please resolve (AU) ee/app/assets/javascripts/ide/components/ide_status_bar.vue
-
@iamphill Please resolve (AU) ee/app/assets/javascripts/ide/components/new_branch_form.vue
-
@iamphill Please resolve (AU) ee/app/assets/javascripts/ide/components/new_dropdown/index.vue
-
@iamphill Please resolve (AU) ee/app/assets/javascripts/ide/components/new_dropdown/modal.vue
-
@iamphill Please resolve (AU) ee/app/assets/javascripts/ide/components/new_dropdown/upload.vue
-
@iamphill Please resolve (AU) ee/app/assets/javascripts/ide/components/repo_edit_button.vue
-
@iamphill Please resolve (AU) ee/app/assets/javascripts/ide/components/repo_editor.vue
-
@iamphill Please resolve (AU) ee/app/assets/javascripts/ide/components/repo_file.vue
-
@iamphill Please resolve (AU) ee/app/assets/javascripts/ide/components/repo_file_buttons.vue
-
@iamphill Please resolve (AU) ee/app/assets/javascripts/ide/components/repo_loading_file.vue
-
@iamphill Please resolve (AU) ee/app/assets/javascripts/ide/components/repo_prev_directory.vue
-
@iamphill Please resolve (AU) ee/app/assets/javascripts/ide/components/repo_preview.vue
-
@iamphill Please resolve (AU) ee/app/assets/javascripts/ide/components/repo_tab.vue
-
@iamphill Please resolve (AU) ee/app/assets/javascripts/ide/components/repo_tabs.vue
-
@iamphill Please resolve (AU) ee/app/assets/javascripts/ide/ide_router.js
-
@iamphill Please resolve (AU) ee/app/assets/javascripts/ide/index.js
-
@iamphill Please resolve (AU) ee/app/assets/javascripts/ide/lib/common/disposable.js
-
@iamphill Please resolve (AU) ee/app/assets/javascripts/ide/lib/common/model.js
-
@iamphill Please resolve (AU) ee/app/assets/javascripts/ide/lib/common/model_manager.js
-
@iamphill Please resolve (AU) ee/app/assets/javascripts/ide/lib/decorations/controller.js
-
@iamphill Please resolve (AU) ee/app/assets/javascripts/ide/lib/diff/controller.js
-
@iamphill Please resolve (AU) ee/app/assets/javascripts/ide/lib/diff/diff.js
-
@iamphill Please resolve (AU) ee/app/assets/javascripts/ide/lib/diff/diff_worker.js
-
@iamphill Please resolve (AU) ee/app/assets/javascripts/ide/lib/editor.js
-
@iamphill Please resolve (AU) ee/app/assets/javascripts/ide/monaco_loader.js
-
@iamphill Please resolve (AU) ee/app/assets/javascripts/ide/services/index.js
-
@iamphill Please resolve (AU) ee/app/assets/javascripts/ide/stores/actions/branch.js
-
@iamphill Please resolve (AU) ee/app/assets/javascripts/ide/stores/actions/file.js
-
@iamphill Please resolve (AU) ee/app/assets/javascripts/ide/stores/actions/project.js
-
@iamphill Please resolve (AU) ee/app/assets/javascripts/ide/stores/actions/tree.js
-
@iamphill Please resolve (AU) ee/app/assets/javascripts/ide/stores/getters.js
-
@iamphill Please resolve (AU) ee/app/assets/javascripts/ide/stores/index.js
-
@iamphill Please resolve (AU) ee/app/assets/javascripts/ide/stores/mutation_types.js
-
@iamphill Please resolve (AU) ee/app/assets/javascripts/ide/stores/mutations.js
-
@iamphill Please resolve (AU) ee/app/assets/javascripts/ide/stores/mutations/branch.js
-
@iamphill Please resolve (AU) ee/app/assets/javascripts/ide/stores/mutations/file.js
-
@iamphill Please resolve (AU) ee/app/assets/javascripts/ide/stores/mutations/project.js
-
@iamphill Please resolve (AU) ee/app/assets/javascripts/ide/stores/mutations/tree.js
-
@iamphill Please resolve (AU) ee/app/assets/javascripts/ide/stores/state.js
-
@iamphill Please resolve (AU) ee/app/assets/javascripts/ide/stores/utils.js
-
@iamphill Please resolve (AU) ee/app/views/ide/index.html.haml
-
@iamphill Please resolve (AU) ee/spec/features/projects/tree/create_directory_spec.rb
-
@iamphill Please resolve (AU) ee/spec/features/projects/tree/create_file_spec.rb
-
@iamphill Please resolve (AU) ee/spec/features/projects/tree/upload_file_spec.rb
-
@nick.thomas Please resolve (AA) lib/gitlab/verify/lfs_objects.rb
-
@nick.thomas Please resolve (AA) lib/gitlab/verify/uploads.rb
-
@nick.thomas Please resolve (UU) spec/factories/lfs_objects.rb
-
@iamphill Please resolve (AU) spec/javascripts/ide/components/commit_sidebar/list_collapsed_spec.js
-
@iamphill Please resolve (AU) spec/javascripts/ide/components/commit_sidebar/list_item_spec.js
-
@iamphill Please resolve (AU) spec/javascripts/ide/components/commit_sidebar/list_spec.js
-
@iamphill Please resolve (AU) spec/javascripts/ide/components/ide_context_bar_spec.js
-
@iamphill Please resolve (AU) spec/javascripts/ide/components/ide_repo_tree_spec.js
-
@iamphill Please resolve (AU) spec/javascripts/ide/components/ide_side_bar_spec.js
-
@iamphill Please resolve (AU) spec/javascripts/ide/components/ide_spec.js
-
@iamphill Please resolve (AU) spec/javascripts/ide/components/new_branch_form_spec.js
-
@iamphill Please resolve (AU) spec/javascripts/ide/components/new_dropdown/index_spec.js
-
@iamphill Please resolve (AU) spec/javascripts/ide/components/new_dropdown/modal_spec.js
-
@iamphill Please resolve (AU) spec/javascripts/ide/components/new_dropdown/upload_spec.js
-
@iamphill Please resolve (AU) spec/javascripts/ide/components/repo_edit_button_spec.js
-
@iamphill Please resolve (AU) spec/javascripts/ide/components/repo_file_buttons_spec.js
-
@iamphill Please resolve (AU) spec/javascripts/ide/components/repo_file_spec.js
-
@iamphill Please resolve (AU) spec/javascripts/ide/components/repo_loading_file_spec.js
-
@iamphill Please resolve (AU) spec/javascripts/ide/components/repo_prev_directory_spec.js
-
@iamphill Please resolve (AU) spec/javascripts/ide/components/repo_preview_spec.js
-
@iamphill Please resolve (AU) spec/javascripts/ide/components/repo_tab_spec.js
-
@iamphill Please resolve (AU) spec/javascripts/ide/components/repo_tabs_spec.js
-
@iamphill Please resolve (AU) spec/javascripts/ide/lib/common/disposable_spec.js
-
@iamphill Please resolve (AU) spec/javascripts/ide/lib/common/model_manager_spec.js
-
@iamphill Please resolve (AU) spec/javascripts/ide/lib/common/model_spec.js
-
@iamphill Please resolve (AU) spec/javascripts/ide/lib/decorations/controller_spec.js
-
@iamphill Please resolve (AU) spec/javascripts/ide/lib/diff/controller_spec.js
-
@iamphill Please resolve (AU) spec/javascripts/ide/lib/diff/diff_spec.js
-
@iamphill Please resolve (AU) spec/javascripts/ide/lib/editor_options_spec.js
-
@iamphill Please resolve (AU) spec/javascripts/ide/lib/editor_spec.js
-
@iamphill Please resolve (AU) spec/javascripts/ide/monaco_loader_spec.js
-
@iamphill Please resolve (AU) spec/javascripts/ide/stores/actions/branch_spec.js
-
@iamphill Please resolve (AU) spec/javascripts/ide/stores/actions/file_spec.js
-
@iamphill Please resolve (AU) spec/javascripts/ide/stores/actions/tree_spec.js
-
@iamphill Please resolve (AU) spec/javascripts/ide/stores/getters_spec.js
-
@iamphill Please resolve (AU) spec/javascripts/ide/stores/mutations/branch_spec.js
-
@iamphill Please resolve (AU) spec/javascripts/ide/stores/mutations/file_spec.js
-
@iamphill Please resolve (AU) spec/javascripts/ide/stores/mutations/tree_spec.js
-
@iamphill Please resolve (AU) spec/javascripts/ide/stores/mutations_spec.js
-
@iamphill Please resolve (AU) spec/javascripts/ide/stores/utils_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!
Edited by Nick Thomas