# Conflicts:
#	app/controllers/projects/clusters/gcp_controller.rb
#	app/views/projects/clusters/gcp/_form.html.haml
#	app/views/projects/clusters/gcp/login.html.haml

Improve structure of snippets documentation

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

Add Wiki and Snippets to project feature overview

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

[ci skip]

Update "col-xs" usage to bootstrap4

Closes #47002

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

Make Repository#blob_data_at a public method

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

Add missing usage_ping_enabled to API settings

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

Fix   after sign-in with Google button

Closes #45551

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

Identified while resolving conflicts in https://gitlab.com/gitlab-org/gitlab-ee/merge_requests/5906

Upgrade eslint 3 -> 4

Closes #40476

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

Line profiling modal width

Closes #46999

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

This reduces conflicts with EE, where it is public because it is
called in ee/lib/gitlab/ci/external/file/local.rb.

Resolve "BS4: Import project page is missing margins and wells"

Closes #46879

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

Remove version lock on awesome_print dependency

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

Only preload member records for the relevant projects/groups/user in projects API

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

Replace grape-route-helpers with our own grape-path-helpers

Closes #45718

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

Simplify spec: `2.times.each` -> `2.times`

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

Consider we might have prefix for stable branches

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

Resolve "gitlab is not sending ObjectStore timeout value to workhorse"

Closes #46917

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

Bumps kubeclient gem version to 3.1.0

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

Add `shared_projects` endpoint

Closes #46800

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

Resolve "Job Failed #71275338"

Closes #46973

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

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

Fix boolean casting for nil value

Closes #46925

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

add details on root flag related to no_root_squash

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

Fixed broken link to build team in documentation

Closes #46949

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

This gem (https://gitlab.com/gitlab-org/grape-path-helpers) makes a number of changes:

1. Brings in @mdelaossa's changes in https://github.com/reprah/grape-route-helpers/pull/21
2. Fixes some broken specs and code for Grape 1.0+
3. Optimizes the generation of paths by bringing in @dblessing's
   HashWithIndifferentAccess changes in https://gitlab.com/gitlab-org/gitlab-ce/issues/45718#note_70123793

Closes #45718

Extracted auxiliary methods from storage.rake into specific RakeHelper

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