delta/gitlab/gitlab-ce.git/spec/lib, branch git-write-ref-prep

Merge branch 'delay-background-migrations' into 'master'

2018-01-08T13:06:49+00:00

Run background migrations with a minimum interval

Closes #41624

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

Merge branch 'remove-commit-tree' into 'master'

2018-01-08T11:31:10+00:00

Remove the Commit#tree method

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

Merge branch 'gitaly-fetch-internal-remote' into 'master'

2018-01-08T10:42:35+00:00

Incorporate RemoteService.FetchInternalRemote Gitaly RPC

Closes gitaly#857

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

Merge branch '39957-redirect-to-gpc-page-if-users-try-to-create-a-cluster-but-the-account-is-not-enabled' into 'master'

2018-01-07T18:56:09+00:00

Resolve "Redirect to GCP page if users try to create a cluster but the account is not enabled"

Closes #39957 and #41410

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

Merge branch 'fix/gb/fix-import-export-restoring-associations' into 'master'

2018-01-07T16:02:40+00:00

Fix restoring associations with import/export

Closes #41646

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

Fix error 500 when viewing commit and merge request diffs

2018-01-07T12:49:07+00:00

Due to the refactoring in !16082, `Blob#batch` no longer falls back
to a default `blob_size_limit`. Since `Repository#batch_blobs` was using
a default `nil` value, this would cause issues in the `Blob#find_by_rugged`
method.

This fix here is to be consistent and use a non-nil default value in
`Repository#batch_blobs`.

The problem was masked in development and tests because Gitaly is always
enabled by default for all features.

Closes #41735

Merge branch 'master' into 39957-redirect-to-gpc-page-if-users-try-to-create-a-cluster-but-the-account-is-not-enabled

2018-01-06T18:58:27+00:00

Merge branch '22643-manual-job-page' into 'master'

2018-01-06T14:40:45+00:00

Resolve "Improve non-triggered manual action job detail page"

Closes #22643 and #37843

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

Merge branch 'master' into fix/gb/fix-import-export-restoring-associations

2018-01-06T07:36:26+00:00

* master: (114 commits)

Merge branch 'master' into 39957-redirect-to-gpc-page-if-users-try-to-create-a-cluster-but-the-account-is-not-enabled

2018-01-05T19:04:33+00:00