Backport merge_params.html.haml conflict comment

See merge request !2120

EE: Fix raw_path with the new job path, rename builds to jobs in test

See merge request !2129

EE: Use the same way to invalidate cache from EE

See merge request !2134

[ci skip]

[ci skip]

Adding Benefit and Qualification sections to EE products

See merge request !2110

Fix transient error with filtered search lazy author/assignee tokens

Closes #2661

See merge request !2142

Fix https://gitlab.com/gitlab-org/gitlab-ee/issues/2661

CE Upstream - Monday

Closes omnibus-gitlab#1714, gitlab-ce#32587, and gitlab-ce#32218

See merge request !2107

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

Related issues FE Base

Closes #2001

See merge request !1797

Remove duplicate Project after_validation entry

See merge request !2133

* ee/master:
  Changelog
  Fix GeoDynaicBackoff strategy code and added specs
  Enable RSpec/SingleLineHook cop
  Correct RSpec/SingleLineHook cop offenses
  Add a custom RSpec/SingleLineHook cop
  Fix approval spec for project with only one member

If we don’t do this the links are unclickable because the top bar is on top of them.

:web_url will expose the full URL to the group making it unreachable on tests since the URL will not have the correct port on it.

Geo: Fix Dynamic Backoff strategy and add specs

Closes #2639

See merge request !2128

This could be caused by a double request or could have been remoevd by
someone else in another tab

See the previous version of this MR,
https://gitlab.com/gitlab-org/gitlab-ee/merge_requests/1816

Also includes refactoring updates

See https://gitlab.com/gitlab-org/gitlab-ee/merge_requests/1797

Conflicts:
	app/assets/javascripts/issuable/issuable_bundle.js

See https://gitlab.com/gitlab-org/gitlab-ee/merge_requests/1797

See https://gitlab.com/gitlab-org/gitlab-ee/merge_requests/1797