diff options
| author | Robert Speicher <robert@gitlab.com> | 2016-06-15 18:35:37 +0000 |
|---|---|---|
| committer | Robert Speicher <robert@gitlab.com> | 2016-06-15 18:35:37 +0000 |
| commit | 2cfbf3e89cfab664cf75fe8c7a7676e0245f85de (patch) | |
| tree | 0239c896fcc11bd1865348470d06515473f19c82 /CHANGELOG | |
| parent | 32a5ff70d771e7bff4e5c7b42fe95a966fa47a96 (diff) | |
| parent | 17ad286e5db45c2d0d39fdceb8f201fe2e780a25 (diff) | |
| download | gitlab-ce-2cfbf3e89cfab664cf75fe8c7a7676e0245f85de.tar.gz | |
Merge branch '18131-pressing-merge-when-build-succeeds-at-the-same-exact-time-that-a-build-is-failing-will-merge-the-failed-build' into 'master'
Fix race condition on auto merge
Resolves #18131
See merge request !4443
Diffstat (limited to 'CHANGELOG')
| -rw-r--r-- | CHANGELOG | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/CHANGELOG b/CHANGELOG index b767996bc82..b916f880eeb 100644 --- a/CHANGELOG +++ b/CHANGELOG @@ -42,6 +42,7 @@ v 8.9.0 (unreleased) - Add DB index on users.state - Add rake task 'gitlab:db:configure' for conditionally seeding or migrating the database - Changed the Slack build message to use the singular duration if necessary (Aran Koning) + - Fix race condition on merge when build succeeds - Links from a wiki page to other wiki pages should be rewritten as expected - Add option to project to only allow merge requests to be merged if the build succeeds (Rui Santos) - Fix issues filter when ordering by milestone |