CE upstream - Friday

Files to resolve:

• @filipa Please resolve (UU) app/assets/images/icons.json
• @filipa Please resolve (UU) app/assets/images/icons.svg
• @jivanvl Please resolve (UU) app/assets/javascripts/projects/project_new.js
• @jprovaznik Please resolve (UU) app/assets/javascripts/vue_merge_request_widget/mr_widget_options.js
• @rymai Please resolve (UU) app/helpers/branches_helper.rb
• @mayra-cabrera Please resolve (UU) app/models/concerns/deployment_platform.rb
• @felipe_artur Please resolve (UU) doc/api/boards.md
• @reprazent Please resolve (UU) doc/api/settings.md
• Jarka Kadlecová Please resolve (UU) lib/api/entities.rb
• @jprovaznik Please resolve (UU) spec/fixtures/api/schemas/entities/merge_request_widget.json
• Dmitriy Zaporozhets Please resolve (UU) spec/javascripts/lib/utils/text_utility_spec.js

Try to resolve one file per commit, and then push (no force-push!) to the ce-to-ee-2018-01-05 branch.

Thanks in advance! ❤

@filipa 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!