EE:  Unify some admin controllers

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

EE: Prefer `expect_next_instance_of` over `expect_any_instance_of`

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

Merge branch 'blackst0ne-rails5-argumenterror-before-process_action-callback-reject_blocked-has-not-been-defined' into 'master'

Resolve "[Rails5] ArgumentError: Before process_action callback :reject_blocked has not been defined"

Closes #6604

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

gitlab-ce!19670 EE-compat check fix

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

CE upstream - 2018-06-25 09:23 UTC

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

Add note about license management first run

Closes #6585

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

# Conflicts:
#	doc/user/project/img/group_issue_board.png
#	doc/user/project/img/issue_board_creation.png
#	doc/user/project/img/issue_board_edit_button.png
#	doc/user/project/img/issue_board_view_scope.png
#	doc/user/project/img/issue_boards_multiple.png

[ci skip]

Merge branch '46396-recognise-when-a-user-is-trying-to-validate-a-private-ssh-key-part-1' into 'master'

(Part 1) Resolve "Recognise when a user is trying to validate a private SSH key"

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

Update requirements.md to make 8GB the minimum instance size

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

Fix auto_cancel_pending_pipelines check

Closes #47834

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

Unify filtered_search_token_keys_spec.js

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

Resolve "2FA should not attempt to use U2F in unsupported browsers"

Closes #40005 and #27772

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

Add test for "Bug: When creating an account with invalid characters the error is "Username already taken" not "Invalid characters used""

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

Merge branch '48260-change-the-bitbucket-import-page-to-indicate-that-its-for-bb-cloud-only-not-for-on-prem-bb' into 'master'

Resolve "Change the BitBucket import page to indicate that its for BB Cloud only, not for on-prem BB"

Closes #48260

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

Resolve "Change the BitBucket import page to indicate that its for BB Cloud only, not for on-prem BB"

Resolve "Help users find our contributing page"

Closes #47274

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

Docs broken links

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

Refactor issue boards and get the EE changes to CE

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

Since 5.0 Rails by default now raises the ArgumentError if an unrecognized
callback is skipped. [1]

This commit adds `raise: false` to act as rails 4.

[1]: https://github.com/rails/rails/commit/d2876141d08341ec67cf6a11a073d1acfb920de7

CE upstream - 2018-06-23 06:21 UTC

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

CE upstream - 2018-06-23 03:21 UTC

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

Log push output on exception

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

CE upstream - 2018-06-22 18:21 UTC

Closes gitaly#222

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

Refactor issue boards

Closes #6434

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