This commit adds a masked CSRF token to the OAuth2 redirect_uri in the
state parameter. To successfully add the Slack integration, the token
must be consistent with the session CSRF token.

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

CE upstream - 2018-09-08 15:21 UTC

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

Resolve "Remove Gitlab::GitAccess#authed_via_jwt?"

Closes #51267

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

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

Closes gitlab-runner#2992 and #2934

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

Removed duplicate specs for `#usage_data` and moved ee specific checks for
`repository_size_limit` to ee/spec/controllers/admin/application_settings_controller_spec.rb

# Conflicts:
#	app/assets/javascripts/projects/project_new.js
#	doc/ci/variables/README.md
#	doc/ci/variables/where_variables_can_be_used.md
#	locale/gitlab.pot
#	spec/controllers/admin/application_settings_controller_spec.rb
#	spec/javascripts/lib/utils/text_utility_spec.js

[ci skip]

CE upstream - 2018-09-07 16:58 UTC

Closes #6948, gitlab-ce#51225, gitlab-ce#40529, gitaly#954, and #7482

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

If one spec disables the usage ping in the in-memory application setting
(e.g. spec/features/usage_stats_consent_spec.rb), then this spec will
fail. To work around this problem, we enable the usage ping explicitly
in the setup phase.

Closes #7511

Resolve "Merge requests show outdated discussions on changes tab"

Closes #48167

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

Fix scoping errors occuring for ContainerRepository on some builds

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

Resolve "Create new project: Re-add project name field"

Closes #2934

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

(Port from CE) Resolve "Create new project: Re-add project name field"

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

Previously overridden in EE but no longer required.

Bump gitlab-shell to 8.3.0

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

Resolve "Process urls with spaces in all markdown processing"

Closes #51233

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

Geo: backend support to allow Secondary node to push to a Primary as push proxying

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

SSH git push to secondary -> proxy to Primary

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

CE counterpart: https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/21607