delta/gitlab/gitlab-ce.git/app, branch background-delete-process

First pass at deleting projects in the background.

2016-01-29T14:14:16+00:00

Merge branch 'note-background-job' into 'master'

2016-01-29T13:51:34+00:00


Background process note logic for #3948

Quick and dirty way to get *most* of the note processing out of band and into the background. Seeing some pretty nice speed bumps. Keep in mind that doing this in process results in slower and slower responses as more notes are added and more participants exist.

```
without background processing
  Completed 200 OK in 627ms (Views: 0.5ms | ActiveRecord: 32.3ms)
  Completed 200 OK in 478ms (Views: 0.8ms | ActiveRecord: 28.3ms)
  Completed 200 OK in 1107ms (Views: 0.6ms | ActiveRecord: 36.6ms)

with background processing
  Completed 200 OK in 108ms (Views: 0.6ms | ActiveRecord: 4.7ms)
  Completed 200 OK in 78ms (Views: 0.5ms | ActiveRecord: 4.5ms)
  Completed 200 OK in 164ms (Views: 0.5ms | ActiveRecord: 8.3ms)
```

As you can see, speeds are consistent when doing the harder work out of process. I'm not sure the number of sql queries we're saving, but based on the logs alone it's a pretty good amount.

@dzaporozhets @yorickpeterse I would love some input on this.

See merge request !2631

Merge branch 'rs-remove-ip-blocking' into 'master'

2016-01-29T13:31:33+00:00


Partially revert "Add IP check against DNSBLs at account sign-up"

This partially reverts 6a5cd3ca - we keep the migration and add a new
migration that reverts it in order to keep migration history intact.

See merge request !2643

Merge branch 'hotfix/ruby-21-broken-update' into 'master'

2016-01-29T08:12:18+00:00


fix syntax error on 2.1 and rubocop on 2.2

Background:

Hashes `{:'key': 'value'}` are not valid in 2.1 but are recommended by Rubocop on 2.2. We only use those when we have a key such as `weird-key`, `weird.key`, etc... 

We could disable Rubocop but it wouldn't warn us about the recommended syntax since `Ruby 1.9`: `{key: 'value'}`, which is valid for `Ruby 1.9+`.

Workaround 1 could be disabling `Style/HashSyntax:` in `rubocop.yml`. 

Workaround 2 (tried in this MR) is to trick Rubocop using `.to_sym` which is effectively the same as adding the `:`. This would allow to keep the warning in place.

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

See merge request !2637

Partially revert "Add IP check against DNSBLs at account sign-up"

2016-01-28T21:28:19+00:00

This partially reverts 6a5cd3ca - we keep the migration and add a new
migration that reverts it in order to keep migration history intact.

Merge branch 'mr-merge-base' into 'master'

2016-01-28T21:08:41+00:00


Correctly determine MR diff base when MR has merge conflicts

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

See merge request !2632

Merge branch 'highlight-blame' into 'master'

2016-01-28T20:30:21+00:00


Fix highlighting in blame view.

See merge request !2630

Merge branch 'rs-ldap-user' into 'master'

2016-01-28T19:09:52+00:00


Backport LDAP user assignment changes from EE

See https://gitlab.com/gitlab-org/gitlab-ee/merge_requests/146

See merge request !2641

Backport LDAP user assignment changes from EE

2016-01-28T18:31:48+00:00

See https://gitlab.com/gitlab-org/gitlab-ee/merge_requests/146

[WIP] Background process note logic for #3948

2016-01-28T18:04:42+00:00