diff options
| author | Robert Speicher <robert@gitlab.com> | 2016-08-31 18:56:48 +0300 |
|---|---|---|
| committer | Robert Speicher <robert@gitlab.com> | 2016-08-31 18:56:48 +0300 |
| commit | d87cca179dcf55ec435e9b7c2d44e9544554d34c (patch) | |
| tree | 9d316031d51fef88b9baa7a2405a2fbfa30f5848 /CHANGELOG | |
| parent | 1ba5988afba568ae9493580de87fad46fcc86f41 (diff) | |
| parent | fd4efde5aa0693c04cc2679b550b271ea40eea39 (diff) | |
Merge branch 'block-concurrent-pipeline-processings' into 'master'
Block concurrent pipeline processings
## What does this MR do?
It's possible that two builds that succeed at the same will try to
concurrently process pipeline. This can lead to scenario when it will
fail to trigger next stages.
This MR makes sure that process of updating is blocking.
Fixes https://gitlab.com/gitlab-org/gitlab-ce/issues/21263
See merge request !6090
Diffstat (limited to 'CHANGELOG')
| -rw-r--r-- | CHANGELOG | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/CHANGELOG b/CHANGELOG index 7dfbd2a5e14..c6923e8b3b2 100644 --- a/CHANGELOG +++ b/CHANGELOG @@ -57,13 +57,11 @@ v 8.12.0 (unreleased) v 8.11.4 (unreleased) - Fix broken gitlab:backup:restore because of bad permissions on repo storage !6098 (Dirk Hörner) - Creating an issue through our API now emails label subscribers !5720 + - Block concurrent updates for Pipeline - Fix resolving conflicts on forks - Fix diff commenting on merge requests created prior to 8.10 - -v 8.11.4 (unreleased) - Fix issue boards leak private label names and descriptions -v 8.11.3 (unreleased) v 8.11.3 - Do not enforce using hash with hidden key in CI configuration. !6079 - Allow system info page to handle case where info is unavailable |