When there are gaps detected while handling the Geo event log, make
sure the primary doesn't clean them up, so return the minimum from
`Geo::EventLogState` and all the gap IDs as `cursor_last_event_id`

Due to the way PostgreSQL replication works can it happen events are
replicated after Geo log cursor tries to replay them. Therefore, track
these gaps in Redis, and try 10 minutes later to replay them.

Closes gitlab-org/gitlab-ee#6956

Use new extendable report_issues.vue (gitlab-ce!20843)

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

Fail Karma tests that take longer than a second (EE-port)

Closes gitlab-ce#44174

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

Backend logic for MVC of SLI Alerts

Closes #5158

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

Fix timing in geo_nodes/components/app_spec.js

Closes #7012

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

Fixed JS error in issue boards

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

CE upstream - 2018-07-25 18:23 UTC

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

[EE] Resolve "API endpoint that returns all members, including the inherited membership through ancestor group"

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

Replace issues time tracking progress bar with gitlab-ui's progress bar (EE)

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

Merge remote-tracking branch 'ce/jacopo-beschi/gitlab-ce-32783-api-all-members-with-ancestors' into gitlab-ce-32783-api-all-members-with-ancestors-ee

# Conflicts:
#	app/models/project_feature.rb
#	db/schema.rb

[ci skip]

Resolve "Broadcast message is misaligned on sign in page"

Closes #49364

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

Geo: Improve Geo Status API performance with cached counters in SiteStatistic

Closes #6064

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

[CE Backport] Geo: Cache projects_count and wikis_count in SiteStatistic

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

Frontend logic for MVC of SLI Alerts

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

CE upstream - 2018-07-25 15:24 UTC

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

fixes #47716 where email confirmation fails after adding additional emails

Closes #47716

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

Add rbtrace to Gemfile

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

Resolve "Move EE JavaScript tests to their own respective directory"

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

# Conflicts:
#	db/migrate/20180503193542_add_indexes_to_remote_mirror.rb

[ci skip]

CE upstream - 2018-07-25 12:22 UTC

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