delta/gitlab/gitlab-ce.git/config, branch fix/encoding-binary-issue

Merge branch 'sidekiq-transaction' into 'master'

2017-06-05T09:34:05+00:00

Forbid Sidekiq scheduling in transactions

Closes #27233

See merge request !9376

Merge branch '30469-convdev-index' into 'master'

2017-06-05T09:18:12+00:00

ConvDev Index

Closes #30469

See merge request !11377

Merge branch '32992-consider-using-zopfli-over-standard-gzip-compression-for-webpack-assets' into 'master'

2017-06-04T11:02:30+00:00

Use zopfli for better asset compression and disable compression in CI

Closes #32992

See merge request !11798

Fix keys seed

2017-06-02T17:37:57+00:00

Allow scheduling from after_commit hooks

2017-06-02T16:43:32+00:00

Forbid Sidekiq scheduling in transactions

2017-06-02T16:43:32+00:00

Scheduling jobs in transactions can lead to race conditions where a job
runs before a transaction has been committed. The added initializer
ensures the various Sidekiq scheduling methods raise an error when
called inside a transaction.

Fixes #27233

Merge branch '32747-translation-of-dates-for-cycle-analytics-is-incomplete' into 'master'

2017-06-02T15:43:59+00:00

Add translations for elapsed time in words

Closes #32747

See merge request !11769

Merge branch '31511-jira-settings' into 'master'

2017-06-02T14:03:15+00:00

Simplify test&save actions when setting a service integration

Closes #31511

See merge request !11599

Add translations for elapsed time in words

2017-06-02T13:54:43+00:00

Merge branch 'winh-karma-sourcemaps' into 'master'

2017-06-02T13:53:33+00:00

Use inline source maps for karma

Closes #30996

See merge request !11815