CE upstream - 2018-02-26 16:08 UTC
Files to resolve:
-
@okoghenun Please resolve (UU) app/assets/javascripts/boards/index.js
-
@jameslopez Please resolve (UU) app/helpers/blob_helper.rb
-
@jameslopez Please resolve (UU) app/views/projects/blob/_header.html.haml
-
@felipe_artur Please resolve (UU) app/views/projects/edit.html.haml
-
@jameslopez Please resolve (UU) app/views/projects/tree/_tree_header.html.haml
-
@nick.thomas Please resolve (UU) config/gitlab.yml.example
-
@nick.thomas Please resolve (UU) config/sidekiq_queues.yml
-
@mikegreiling Please resolve (UU) config/webpack.config.js
-
@nick.thomas Please resolve (UU) db/schema.rb
-
@felipe_artur Please resolve (AA) qa/qa/page/merge_request/show.rb
-
@jprovaznik Please resolve (UU) spec/helpers/issuables_helper_spec.rb
-
@mkozono Please resolve (UU) spec/support/db_cleaner.rb
Try to resolve one file per commit, and then push (no force-push!) to the ce-to-ee-2018-02-26
branch.
Thanks in advance!
@jameslopez 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 Stan Hu