CE upstream - 2018-07-30 21:22 UTC

Files to resolve:

• @felipe_artur Please resolve (UU) app/services/boards/issues/list_service.rb
• @felipe_artur Please resolve (UU) app/views/shared/boards/components/_board.html.haml
• @joshlambert Please resolve (UU) doc/administration/high_availability/nfs.md
• @tiagonbotelho Please resolve (UU) lib/api/projects.rb

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

More detailed instructions

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!