CE upstream - Wednesday

Files to resolve:

• @kushalpandya Please resolve https://gitlab.com/gitlab-org/gitlab-ee/blob/579af288d268244084f85249d09fd76ef8da2ce0/app/assets/stylesheets/pages/groups.scss (UU)
• @DouweM Please resolve https://gitlab.com/gitlab-org/gitlab-ee/blob/579af288d268244084f85249d09fd76ef8da2ce0/app/models/group.rb (UU)
• bogdanvlviv Please resolve https://gitlab.com/gitlab-org/gitlab-ee/blob/579af288d268244084f85249d09fd76ef8da2ce0/config/database.yml.postgresql (UU)
• @vsizov Please resolve https://gitlab.com/gitlab-org/gitlab-ee/blob/579af288d268244084f85249d09fd76ef8da2ce0/config/routes/group.rb (UU)
• @reprazent Please resolve https://gitlab.com/gitlab-org/gitlab-ee/blob/579af288d268244084f85249d09fd76ef8da2ce0/db/schema.rb (UU)
• @reprazent Please resolve https://gitlab.com/gitlab-org/gitlab-ee/blob/579af288d268244084f85249d09fd76ef8da2ce0/doc/api/settings.md (UU)
• @reprazent Please resolve https://gitlab.com/gitlab-org/gitlab-ee/blob/579af288d268244084f85249d09fd76ef8da2ce0/locale/gitlab.pot (UU)
• bogdanvlviv Please resolve https://gitlab.com/gitlab-org/gitlab-ee/blob/579af288d268244084f85249d09fd76ef8da2ce0/scripts/prepare_build.sh (UU)

Once the conflicts resolved, please push (no force-push!) to the ce-to-ee-2017-10-18 branch.

Thanks in advance! ❤️

Note: This merge request was created by an experimental script, it's not perfect (yet)!