CE upstream - 2018-09-03 12:23 UTC

Files to resolve:

• @rspeicher Please resolve (UU) app/views/groups/labels/index.html.haml
• @stanhu Please resolve (UU) config/initializers/1_settings.rb
• @ash.mckenzie Please resolve (UU) doc/update/README.md

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

More detailed instructions

Thanks in advance! ❤

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