Merge branch '42889-avoid-return-inside-block' of gitlab.com:jacopo-beschi/gitlab-ce into 42889-avoid-return-inside-block-ee

* '42889-avoid-return-inside-block' of gitlab.com:jacopo-beschi/gitlab-ce:
  Uses the rubocop helpers expect_offense and expect_no_offenses
  Updates after 4th review
  Updates after 3rd review
  Updates after 2nd review
  Fixes cop errors
  Adds AvoidBreakFromStrongMemoize Cop
  Minor review changes
  Adds Rubocop rule to avoid returning from a block

Avoid creating superfluous namespaces on Geo secondaries during sync

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

Docs: add product badges to docs

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

Geo: add extra reconfigure step in docs to enable FDW

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

CE upstream - 2018-04-17 00:24 UTC

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

Signed-off-by: Rémy Coutable <remy@rymai.me>

Signed-off-by: Rémy Coutable <remy@rymai.me>

Docs: update Web IDE > CE (10.7)

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

Signed-off-by: Rémy Coutable <remy@rymai.me>

ReadyToMergeState needs to be loaded before mrWidgetOptions in app/assets/javascripts/vue_merge_request_widget/dependencies.js
Signed-off-by: Rémy Coutable <remy@rymai.me>

Consider dev.gitlab.org for initializing deprecation of Gitlab::GitalyClient::StorageSettings

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

# Conflicts:
#   doc/user/project/index.md

dev_env_or_com? now considers dev.gitlab.org

Signed-off-by: Rémy Coutable <remy@rymai.me>

Signed-off-by: Rémy Coutable <remy@rymai.me>

Remove ambiguity when forking a project to a user's namespace

Closes gitlab-ce#45350

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

# Conflicts:
#	app/assets/javascripts/vue_merge_request_widget/dependencies.js
#	doc/user/project/web_ide/img/commit_changes.png
#	doc/user/project/web_ide/index.md
#	qa/qa/page/merge_request/show.rb

[ci skip]

CE upstream - 2018-04-16 18:02 UTC

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

Web IDE now in CE

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