delta/gitlab/gitlab-ce.git/spec/support, branch commit-limited-container-width

Merge branch 'pdflab-in-repo' into 'master'

2017-05-02T07:35:49+00:00


Move PDFLab assets into repo

See merge request !10642

Move PDFLab into GitLab

2017-04-28T16:52:36+00:00

Resolve "Add more tests for spec/controllers/projects/builds_controller_spec.rb"

2017-04-28T09:38:32+00:00

Add specs

2017-04-27T17:23:26+00:00

Merge branch 'gitaly-testing-toml' into 'master'

2017-04-25T08:21:06+00:00


Gitaly testing toml

Closes gitaly#182

See merge request !10605

Merge branch 'notebooklab-in-repo' into 'master'

2017-04-24T18:17:49+00:00


Moved NotebookLab assets into repo

See merge request !10630

Merge branch 'jacopo-beschi/gitlab-ce-29712-unnecessary-wait-for-ajax'

2017-04-24T16:06:47+00:00

See merge request !10567

Signed-off-by: Rémy Coutable

Merge branch 'rs-empty-project-features' into 'master'

2017-04-24T14:57:31+00:00


Use `:empty_project` where possible in top-level feature specs

See merge request !10836

Merge branch 'rs-rename-login_as' into 'master'

2017-04-24T11:21:03+00:00


Except where necessary, use `sign_in` over `login_as` in features

See merge request !10320

Move records to the ghost user in a transaction.

2017-04-24T06:46:10+00:00

- While deleting a user, some of the user's associated records are moved to the
  ghost user so they aren't deleted. The user is blocked before these records
  are moved, to prevent the user from creating new records while the migration
  is happening, and so preventing a data race.

- Previously, if the migration failed, the user would _remain_ blocked, which is
  not the expected behavior. On the other hand, we can't just stick the block +
  migration into a transaction, because we want the block to be committed before
  the migration starts (for the data race reason mentioned above).

- One solution (implemented in this commit) is to block the user in a parent
  transaction, migrate the associated records in a nested sub-transaction, and
  then unblock the user in the parent transaction if the sub-transaction fails.