Resolve "ee:geo QA specs are failing as of !7210"

Closes gitlab-org/quality/nightly#7 and #7434

See merge request gitlab-org/gitlab-ee!7315

As a side benefit, we don’t need to resolve the race condition in which
the secondary node does not yet have a GeoNodeStatus when the specs make
requests for it.

Test that alert's environment is verified

See merge request gitlab-org/gitlab-ee!7360

Check that creating an alert for an project non-specific environment
is not possible and return 204.

CE upstream - 2018-09-13 12:21 UTC

Closes gitlab-ce#49621, gitlab-ce#50186, and charts/auto-deploy-app#6

See merge request gitlab-org/gitlab-ee!7359

Remove unused Geo nodes routes

See merge request gitlab-org/gitlab-ee!7352

EE: Add RuboCop cops to enforce code reusing rules

See merge request gitlab-org/gitlab-ee!7229

# Conflicts:
#	config/routes.rb
#	spec/lib/gitlab/ci/config_spec.rb

[ci skip]

Merge branch '50808-choosing-initialize-repo-with-a-readme-breaks-project-created-from-template' into 'master'

Resolve "Choosing “Initialize repo with a README” breaks project created from template"

Closes #50808

See merge request gitlab-org/gitlab-ce!21646

Merge branch 'ee-50808-choosing-initialize-repo-with-a-readme-breaks-project-created-from-template' into 'master'

(Port from CE) create project: hide readme checkbox on all tabs except for "blank project" page

See merge request gitlab-org/gitlab-ee!7332

CE upstream - 2018-09-12 21:21 UTC

Closes gitlab-ce#50989 and gitaly#1124

See merge request gitlab-org/gitlab-ee!7351

Vendor Auto-DevOps.gitlab-ci.yml: fix where the deploy job does not wait for Deployment to complete.

Closes #50186 and charts/auto-deploy-app#6

See merge request gitlab-org/gitlab-ce!21713

Vendor Auto-DevOps.gitlab-ci.yml for refactor to create registry_login() function.

Closes #51450

See merge request gitlab-org/gitlab-ce!21714

Fix route deprecation warnings in rails 5

See merge request gitlab-org/gitlab-ce!21684

[EE] Fix route deprecation warnings in rails 5

See merge request gitlab-org/gitlab-ee!7339

Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>

Merge branch '42861-move-include-external-files-in-gitlab-ci-yml-from-starter-to-libre' into 'master'

Resolve "Move "include external files in .gitlab-ci.yml" from Starter to Libre"

Closes #42861

See merge request gitlab-org/gitlab-ce!21603

Merge branch 'ee-42861-move-include-external-files-in-gitlab-ci-yml-from-starter-to-libre' into 'master'

EE Resolve "Move "include external files in .gitlab-ci.yml" from Starter to Libre"

See merge request gitlab-org/gitlab-ee!7292

Vendors in Auto-DevOps.gitlab-ci.yml from
https://gitlab.com/gitlab-org/gitlab-ci-yml/merge_requests/195

Fixes https://gitlab.com/gitlab-org/gitlab-ce/issues/50186

Vendor Auto-DevOps.gitlab-ci.yml from https://gitlab.com/gitlab-org/gitlab-ci-yml/merge_requests/193

Thanks @LaurentGoderre, for your contribution !

Strip whitespace from Sentry URL

Closes #49621

See merge request gitlab-org/gitlab-ce!21703

[ci skip]

# Conflicts:
#	doc/api/projects.md
#	lib/api/helpers/projects_helpers.rb

[ci skip]

Resolve "500 Internal Server Error: Deleting branch of deleted project"

Closes #50678

See merge request gitlab-org/gitlab-ce!21542

Adding extra whitespace in the DSN could prevent the server from
starting due to InvalidURIErrors in sentry-raven.

Closes https://gitlab.com/gitlab-org/gitlab-ce/issues/49621

Resolve "Placeholder when entering weight value"

Closes #7262

See merge request gitlab-org/gitlab-ee!7346

Remove Rugged and shell code from Gitlab::Git

Closes gitaly#1124

See merge request gitlab-org/gitlab-ce!21488

CE upstream - 2018-09-12 05:25 UTC

See merge request gitlab-org/gitlab-ee!7342