CE upstream - 2018-03-06 20:12 UTC
Files to resolve:
-
Rémy Coutable Please resolve (UU) .gitlab-ci.yml
-
Rémy Coutable Please resolve (UU) app/assets/javascripts/boards/components/board_new_issue.vue
-
@felipe_artur Please resolve (UU) app/assets/javascripts/boards/components/sidebar/remove_issue.js
-
@kushalpandya Please resolve (UU) app/assets/javascripts/boards/filtered_search_boards.js
-
@kushalpandya Please resolve (UU) app/assets/javascripts/boards/index.js
-
Rémy Coutable Please resolve (UU) app/assets/javascripts/boards/mixins/sortable_default_options.js
-
Rémy Coutable Please resolve (UU) app/assets/javascripts/boards/models/issue.js
-
@felipe_artur Please resolve (AA) app/controllers/groups/boards_controller.rb
-
@felipe_artur Please resolve (UU) app/models/board.rb
-
@fjsanpedro Please resolve (UU) app/models/group.rb
-
@smcgivern Please resolve (UU) app/models/project.rb
-
@kushalpandya Please resolve (UU) app/views/groups/labels/index.html.haml
-
@felipe_artur Please resolve (UU) app/views/shared/issuable/_search_bar.html.haml
-
@felipe_artur Please resolve (UU) config/routes/group.rb
-
@felipe_artur Please resolve (UU) config/routes/project.rb
-
@dosuken123 Please resolve (UU) config/sidekiq_queues.yml
-
@dosuken123 Please resolve (UU) db/schema.rb
-
@felipe_artur Please resolve (UU) doc/README.md
-
@felipe_artur Please resolve (AA) doc/api/group_boards.md
-
@felipe_artur Please resolve (AA) lib/api/group_boards.rb
-
@godfat Please resolve (UU) lib/api/job_artifacts.rb
-
@godfat Please resolve (UU) lib/api/merge_requests.rb
-
@dosuken123 Please resolve (UU) lib/gitlab/ci/trace.rb
-
@felipe_artur Please resolve (AA) spec/controllers/groups/boards_controller_spec.rb
-
@felipe_artur Please resolve (UU) spec/factories/boards.rb
-
@felipe_artur Please resolve (UU) spec/javascripts/api_spec.js
-
@dosuken123 Please resolve (UU) spec/lib/gitlab/ci/trace_spec.rb
-
@felipe_artur Please resolve (UU) spec/views/layouts/nav/sidebar/_project.html.haml_spec.rb
Try to resolve one file per commit, and then push (no force-push!) to the ce-to-ee-2018-03-06
branch.
Thanks in advance!
@felipe_artur 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 Lin Jen-Shin