delta/gitlab/gitlab-ce.git/db/migrate, branch fix-mentioned-users-on-diff-notes

Revert "Merge branch '18193-developers-can-merge' into 'master' "

2016-07-13T18:57:30+00:00

This reverts commit 9ca633eb4c62231e4ddff5466c723cf8e2bdb25d, reversing
changes made to fb229bbf7970ba908962b837b270adf56f14098f.

Enforce "developers can merge" during `pre-receive`.

2016-07-13T07:54:56+00:00

1. When a merge request is being merged, save the merge commit SHA in
   the `in_progress_merge_commit_sha` database column.

2. The `pre-receive` hook looks for any locked (in progress) merge
   request with `in_progress_merge_commit_sha` matching the `newrev` it
   is passed.

3. If it finds a matching MR, the merge is legitimate.

4. Update `git_access_spec` to test the behaviour we added here. Also
   refactored this spec a bit to make it easier to add more contexts / conditions.

Added "developers can merge" setting to protected branches

2016-07-13T07:54:26+00:00

- Cherry-picked from `mvestergaard:branch-protection-dev-merge`
- https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/4220

Delete award emoji when deleting a user

2016-07-12T18:07:39+00:00

Optimistic locking for Issue and Merge Requests

2016-07-12T16:52:14+00:00

Merge branch 'fix/remove-import-url-migration' into 'master'

2016-07-11T07:53:13+00:00


Remove slow migration and add fix to sanitize errors

Getting rid of the slow migration and preventing the Error to occur

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

See merge request !5176

remove fix validatable import url migration

2016-07-11T06:56:45+00:00

Merge branch 'fix-broken-mysql-migration' into 'master'

2016-07-08T16:11:45+00:00


Fix broken migration in MySQL

`keys` is a reserved name in MySQL, so if this migration actually attempted to remove any duplicate keys it would fail.

Closes #19344

See merge request !5005

Merge branch 'fix/import-url-migration' into 'master'

2016-07-08T10:18:42+00:00


import_url migration performance improvements

 Nullifying empty import_urls upfront so the number of projects with import_url not NULL decreases to 1/5.

 Also, now processing batches in blocks of 1000, with a threaded process - a bit experimental.

See merge request !5149

fix thread join issue

2016-07-08T09:00:30+00:00