…if not a 404, or if no body is present, because the result will be saved as `missing_on_primary`, which does not allow NULL.

EE: revert goldiloader for EE master

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

Resolve "Avoid possible infinite loops in Container Scanning"

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

CE Port: Fix Custom hooks are not triggered by UI wiki edit

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

Port Group member contribution analytics table to Vue

Closes #4949

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

This reverts the addition of the "goldiloader" Gem and all use of it.
While this Gem is very promising it's causing a variety of problems on
GitLab.com due to it eager-loading too much data in places where we
don't expect/can handle this. At least for the time being this means we
have to go back to manually fixing N+1 query problems, but at least
those should not cause a negative impact on availability.

Fix security products examples

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

CE upstream - 2018-04-17 20:56 UTC

Closes gitaly#401 et gitlab-org/release/docs#9

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

EE Port of CE!18422

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

Ee blackst0ne rails5 add safe params helper

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

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

EE: Resolve "Make a Rubocop that forbids returning from a block"

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

Avoid wrong closing dates being caught by the query on Burndown charts

Closes gitlab-com/support-forum#3273

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

Update docs subgroup issues in group board

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

Remove differences with CE version of update_pages_service.rb

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

Usage ping for projects_reporting_ci_cd_back_to_github

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

Merge branch 'jej/5598-documentation-changelog-for-branch-unprotection-restrictions-api' into 'master'

First part of "Documentation & Changelog for Branch Unprotection Restrictions & API"

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

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

Rails 5.0 requires to explicitly permit attributes when building a URL
using current `params` object.

The `safe_params` helper allows developers to just call `safe_params.merge(...)`
instead of manually adding `permit` to every call.

https://github.com/rails/rails/pull/20868