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

CE upstream - 2018-05-30 15:02 UTC

Closes #6045, #2678, and omnibus-gitlab#2138

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

Treat external authorization service response status 403 as failure

Closes #6235

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

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

[ci skip]

[ci skip]

Fix bad merge causing duplicate methods in app/assets/javascripts/vue_merge_request_widget/components/states/ready_to_merge.vue

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

EE-Port of gitlab-ce!19182

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

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.

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

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

# Conflicts:
#	Gemfile.lock
#	app/models/repository.rb
#	app/views/projects/merge_requests/show.html.haml
#	app/views/shared/_import_form.html.haml
#	doc/api/merge_requests.md
#	doc/ci/variables/README.md
#	doc/ci/variables/where_variables_can_be_used.md
#	doc/user/project/merge_requests/index.md
#	doc/user/project/merge_requests/squash_and_merge.md
#	lib/api/settings.rb
#	lib/api/v3/merge_requests.rb
#	spec/fixtures/api/schemas/entities/merge_request_widget.json
#	spec/fixtures/api/schemas/public_api/v3/merge_requests.json
#	spec/fixtures/api/schemas/public_api/v4/merge_requests.json

[ci skip]

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

Closes #46879

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

Resolve "Geo: Unauthenticated rate limits should not block Geo requests"

Closes #5974

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

Fix import project by url layout

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