delta/gitlab/gitlab-ce.git/db, branch fix-migration-changes

Merge branch '24386-8-14-rc1-requires-quite-amount-of-downtime' into 'master'

2016-11-11T20:14:56+00:00


Update 8.14-rc1 migrations to minimize downtime and deploy time

## What does this MR do?

Modify 8.14-rc1 migrations and code to minimize downtime and deploy time

## Are there points in the code the reviewer needs to double check?

No

## Why was this MR needed?

8.14-rc1 migrations took too much time in staging, so we didn't want to take too much downtime in production

## Does this MR meet the acceptance criteria?

- Tests
  - [x] Added for this feature/bug
  - [x] All builds are passing
- [x] Conform by the [merge request performance guides](http://docs.gitlab.com/ce/development/merge_request_performance_guidelines.html)
- [x] Conform by the [style guides](https://gitlab.com/gitlab-org/gitlab-ce/blob/master/CONTRIBUTING.md#style-guides)
- [x] Branch has no merge conflicts with `master` (if it does - rebase it please)
- [x] [Squashed related commits together](https://git-scm.com/book/en/Git-Tools-Rewriting-History#Squashing-Commits)

## What are the relevant issue numbers?


Closes #24386

See merge request !7427

Update 8.14-rc1 migrations to minimize downtime and deploy time

2016-11-11T18:34:00+00:00

See https://gitlab.com/gitlab-org/gitlab-ce/issues/24386

Merge branch 'sidekiq-job-throttling' into 'master'

2016-11-11T18:32:40+00:00


Allow certain Sidekiq jobs to be throttled

## What does this MR do?

Allows certain slow running Sidekiq jobs to be throttled. It is disabled by default and can be enabled via the Application Settings. 

![Screen_Shot_2016-11-04_at_4.51.24_PM](/uploads/a1f1d24c693fcdb278602765cd404d94/Screen_Shot_2016-11-04_at_4.51.24_PM.png)

## Does this MR meet the acceptance criteria?

- [x] [CHANGELOG](https://gitlab.com/gitlab-org/gitlab-ce/blob/master/CHANGELOG.md) entry added
- [x] [Documentation created/updated](https://gitlab.com/gitlab-org/gitlab-ce/blob/master/doc/development/doc_styleguide.md)
- Tests
  - [x] Added for this feature/bug
  - [x] All builds are passing

## What are the relevant issue numbers?

Related to #23352

See merge request !7292

Fix project records with invalid visibility_level values

2016-11-10T17:58:31+00:00

The AddVisibilityLevelToGroups migration introduced a visibility_level for
namespaces and specified that projects should always have a visibility level
less than or equal to their namespace. However, some invalid rows could have
been created.

This commit introduces a migration that updates the invalid rows, setting the
invalid project to have the same visibility_level as their namespaces. This
will make some projects internal or private when they would previously have
been public or internal, but this is better than silently making an internal
or private group public.

Allow the Sidekiq queues to throttle and the factor by which to throttle them to be configurable

2016-11-10T17:38:11+00:00

Allow certain Sidekiq jobs to be throttled

2016-11-10T17:38:10+00:00

Merge branch 'use-separate-token-for-incoming-email' into 'master'

2016-11-08T10:47:45+00:00


Use separate email-friendly token for incoming email

See merge request !5914

implements reset incoming email token on issues modal and account page,

2016-11-07T15:56:18+00:00

reactivates all tests and writes more tests for it

Use separate email-friendly token for incoming email and let incoming

2016-11-07T15:55:42+00:00

email token be reset

Merge branch 'jacobvosmaer-gitlab/gitlab-ce-git-gc-improvements' into 'master'

2016-11-07T12:13:02+00:00


Use more than one kind of Git garbage collection

Replaces https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/6588 by @jacobvosmaer to get the builds to pass :)

Closes #22729

See merge request !7321