# Conflicts:
#	config/application.rb
#	locale/gitlab.pot

[ci skip]

CE upstream - 2018-08-04 09:23 UTC

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

Add support for Bitbucket Server imports

Closes #25393

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

Resolve "Open "View full report" in new window"

Closes #7124

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

Resolve "Charts with long label appear oversized"

Closes #48419

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

Revert "Merge branch 'bvl-instance-stats-default' into 'master'"

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

Persist 'auto devops' banner dismissal globally

Closes #48657

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

Respond to DB health in background migrations

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

Merge branch '7065-performance-metrics-not-rendered-properly-in-merge-request-widget-ee' of gitlab.com:gitlab-org/gitlab-ee into 7065-performance-metrics-not-rendered-properly-in-merge-request-widget-ee

Correct grammar on "Introduction to Git Flow" page in documentation

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

Retrieve merge request closing issues from database cache

Closes #44821

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

This reverts merge request !21044

Merge branch '7065-performance-metrics-not-rendered-properly-in-merge-request-widget-ee' of gitlab.com:gitlab-org/gitlab-ee into 7065-performance-metrics-not-rendered-properly-in-merge-request-widget-ee

Resolve "Increase width of left column in reports modal"

Closes #49835

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

Allow multiple JIRA transitions id split by comma or semicolon

Closes #43602

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

The background migration interval has been reduced from 5 minutes to 2
minutes, so we have to adjust this migration accordingly.

This changes the BackgroundMigration worker so it checks for the health
of the DB before performing a background migration. This in turn allows
us to reduce the minimum interval, without having to worry about blowing
things up if we schedule too many migrations.

In this setup, the BackgroundMigration worker will reschedule jobs as
long as the database is considered to be in an unhealthy state. Once the
database has recovered, the migration can be performed.

To determine if the database is in a healthy state, we look at the
replication lag of any replication slots defined on the primary. If the
lag is deemed to great (100 MB by default) for too many slots, the
migration is rescheduled for a later point in time.

The health checking code is hidden behind a feature flag, allowing us to
disable it if necessary.

Follow-up: Geo log cursor gap tracking improvements

Closes #7057

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

Hide instance statistics by default

Closes #50000

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

Making the migrations and the default do the right thing in the first
place. This makes 20180806094307 a no-op.

Reduce the number of queries to the minimum.

Add a generic more CSS class to render expandable reports correctly

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

Link the License Management report in the MR widget with the pipeline level one

Closes #6727

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

Resolve "Remove status text in the MR widget license report"

Closes #7073

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