CE upstream - 2018-04-20 12:24 UTC
Files to resolve:
-
@jameslopez Please resolve (UU) CHANGELOG.md
-
Andrea Kao Please resolve (UU) LICENSE
-
@felipe_artur Please resolve (UU) app/assets/javascripts/boards/models/list.js
-
@smcgivern Please resolve (UU) app/models/issue.rb
-
@ash.mckenzie Please resolve (UU) db/schema.rb
-
@nick.thomas Please resolve (UU) doc/api/projects.md
-
@nick.thomas Please resolve (AA) lib/api/helpers/project_snapshots_helpers.rb
-
@rdavila Please resolve (UU) spec/lib/gitlab/import_export/safe_model_attributes.yml
-
@smcgivern Please resolve (UU) spec/models/issue_spec.rb
Try to resolve one file per commit, and then push (no force-push!) to the ce-to-ee-2018-04-20
branch.
Thanks in advance!
@smcgivern 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 Rubén Dávila