delta/gitlab/gitlab-ce.git/db/post_migrate, branch ide-diff-cursor

Merge branch 'master' into 'latest-security-to-master-21-03-18'

2018-03-22T11:04:03+00:00

# Conflicts:
#   Gemfile
#   Gemfile.lock

Merge branch 'fix/auth0-unsafe-login-10-6' into 'security-10-6'

2018-03-21T14:43:47+00:00

[10.6] Fix GitLab Auth0 integration signs in the wrong user

See merge request gitlab/gitlabhq!2354

Shortcut concurrent foreign key creation if already exists.

2018-03-20T17:44:00+00:00

Closes #43887.

Fix concurrency issue with migration for user_interacted_projects table.

2018-03-14T16:51:47+00:00

The concurrency issue originates from inserts on
`user_interacted_projects` from the app while running the post-deploy
migration.

This change comes with a strategy to lock the table while removing
duplicates and creating the unique index (and similar for FK
constraints).

Also, we'll have a non-unique index until the post-deploy migration is
finished to speed up queries during that time.

Closes #44205.

Merge branch '43460-track-projects-a-user-contributed-to' into 'master'

2018-03-07T12:55:18+00:00

Keep track of projects a user interacted with

Closes #43460

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

Move update_head_pipeline_for_merge_request queue to pipeline_processing namespace

2018-03-06T16:39:00+00:00

Integrate two workers into one ArchiveTraceWorker with pipeline_background queue. This queue takes loqer precedence than pipeline_default.

2018-03-06T12:44:15+00:00

Improve robustness of migration.

2018-03-06T11:53:15+00:00

For MySQL, foreign keys are dependent on index.

2018-03-06T11:53:14+00:00

Rename to UserInteractedProjects.

2018-03-06T11:53:14+00:00

This is to avoid a mix-up with the existing concept of 'user
contributions'. See `User#contributed_projects` or
`Event#contributions`.