delta/gitlab/gitlab-ce.git/db, branch api-sentry-extra

Merge branch '36631-activerecord-statementinvalid-pg-querycanceled-error-canceling-statement-due-to-statement-timeout' into 'master'

2017-09-29T13:43:28+00:00

Insert at most 1,000 rows at once in MR diff background migration

Closes #36631 et #37505

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

Fix notes type created from import

2017-09-29T11:18:58+00:00

Reschedule merge request diff background migration

2017-09-29T10:56:08+00:00

The first attempt didn't migrate all rows on GitLab.com, due to a couple of
issues:

1. Some rows in merge_request_diffs had truly huge numbers of commits and diffs
   serialised - one in particular had 26,000 commits!
2. The jobs were sometimes on Sidekiq hosts with frequent OOM errors, leading to
   the job being lost.

The previous commit adds more logging, and a more robust insertion method. This
commit reschedules the jobs, with a generous pause between each.

Merge branch 'add-composite-index-on-merge-requests-merge-commit-sha' into 'master'

2017-09-29T08:57:52+00:00

Add index for merge_requests.merge_commit_sha

Closes #38507

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

Merge branch 'hashed-storage-migration-path' into 'master'

2017-09-28T17:26:16+00:00

Hashed storage migration path

Closes gitlab-ee#3118

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

Support custom attributes on users

2017-09-28T16:49:42+00:00

[Backported from EE] Readonly flag for Projects

2017-09-28T12:20:11+00:00

This is used in EE for the storage migration, and we want to use this
in CE as well to be able to migrate projects to hashed_storage.

Add index for merge_requests.merge_commit_sha

2017-09-28T11:31:28+00:00

This is a composite index on (target_project_id, merge_commit_sha, id)
that allows queries such as the following to use a full backwards index
scan:

    SELECT "merge_requests".*
    FROM "merge_requests"
    WHERE "merge_requests"."deleted_at" IS NULL
    AND "merge_requests"."target_project_id" = 13083
    AND "merge_requests"."merge_commit_sha" = 'e80a893ff0ea8466099f6478183631af55933db2'
    ORDER BY "merge_requests"."id" DESC
    LIMIT 1;

Fixes https://gitlab.com/gitlab-org/gitlab-ce/issues/38507

Remove an unneeded index on ci_builds left in some databases

2017-09-26T09:33:20+00:00

Migration 20170919211300_remove_temporary_ci_builds_index.rb created a
temporary partial index and tried to drop it at the end of the
migration. In some circumstances apparently it failed to drop the
index and it ended up in our schema.rb.

This accidentally failed to fail due to a bug in the regular
expression for partial indexes which caused the index creation in
schema.rb to be ignored. Now that that's fixed we could be
resurrecting this zombie index from the past in some but not all
databases.

Add a migration to drop this index if it's present to reconcile this
discrepancy.

Fix PG::UniqueViolation external_email migration

2017-09-25T10:17:48+00:00

Missing parens prevented this migration from working in some cases.

Closes #38246