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

Use `default_value_for` to handle null values in only_allow_merge_if_all_discussions_are_resolved

2016-11-14T15:39:08+00:00

Merge branch 'sh-fix-sidekiq-throttling-init' into 'master'

2016-11-14T10:29:45+00:00


Only turn on Sidekiq throttling if column exists

If the database has not been migrated properly, the initializer for Sidekiq will fail to start and cause the whole Rails server to crash. This change checks the existence for the column and allows Rails to start even if the setting has not been added as a database column.

Closes #24452

See merge request !7446

Merge branch 'zj-remove-unneeded-checks' into 'master'

2016-11-14T10:14:16+00:00


Remove unneeded nil checks

See merge request !7437

Only turn on Sidekiq throttling if application settings exists

2016-11-13T00:00:21+00:00

If the database has not been migrated properly, the initializer for Sidekiq
will fail to start and cause the whole Rails server to crash. This change
checks the existence for the column and allows Rails to start even
if the setting has not been added as a database column.

Closes #24452

Remove unneeded nil checks

2016-11-12T10:20:06+00:00

The library we're using, default_value_for, is configured to interpret nil
as the default value, being ENABLED. Given the property can't be nil
this check is unneeded.

Does not raise error when Note not found when processing NewNoteWorker

2016-11-12T00:54:11+00:00

- Also remove unnecessary param

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

Refactored Sidekiq Throttler and updated documentation

2016-11-11T17:14:58+00:00