Fix Geo log cursor outputting nested message structures in geo.log

Closes #4860

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

Resolve "Migration specs fail locally if no Geo DB is configured"

Closes #4852

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

Bumps Gitlab Shell version to 6.0.3

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

Show Group level Roadmap

Closes #3559

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

In EE, if you don't have a Geo secondary set up, trying to reset every
descendant of ActiveRecord::Base will fail on those that descend from
Geo::TrackingBase. We can ignore those errors in EE.

Update docs labels CE

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

Fixed geo_nodes karma spec

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

Add developer docs for how to add a licensed feature

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

CE upstream - 2018-02-08 11:35 UTC

Closes #4857, gitaly#996, and gitaly#985

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

10.5 EE Create the "Update" guides

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

Closes #4860

# Conflicts:
#	app/assets/javascripts/pipelines/components/async_button.vue
#	locale/gitlab.pot

[ci skip]

Memoize MergeRequest#rebase_in_progress? to prevent N+1 queries in Gitaly

Closes #4857

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

CE upstream - 2018-02-07 20:29 UTC

Closes #4813, gitaly#880, gitaly#1000, and gitaly#994

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

Fix concurrent fork network migrations

Closes #41487

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

Memoize MergeRequest#rebase_in_progress? to prevent N+1 queries in Gitaly

Closes gitlab-ee#4857

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

Move Namespace to Gitaly using OPT-OUT

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

Added changed state to IDE

Closes #4540

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

MergeRequest#rebase_in_progress? and MergeRequest#rebase_path were called
twice each time per request. This memoization helps reduce the overall number
of queries.

See https://gitlab.com/gitlab-org/gitlab-ee/-/jobs/51616319 as a failing
job.

Closes gitlab-org/gitlab-ee#4857

MergeRequest#rebase_in_progress? and MergeRequest#rebase_path were called
twice each time per request. This memoization helps reduce the overall number
of queries.

See https://gitlab.com/gitlab-org/gitlab-ee/-/jobs/51616319 as a failing
job.

Closes gitlab-org/gitlab-ee#4857

Remove N + 1 block for Root#show

Closes #37434 and gitaly#996

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

Fix sample fstab file in GitLab HA docs

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

Update style_guide_scss.md

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

Add SSO and CAPTCHA notes to JIRA docs

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

added more specs

Since the migration might be queued already and be rescheduled when it
fails on a uniqueness error, this should help clearing the background
migration queue faster.