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 /.flayignore | |
| 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 '.flayignore')
0 files changed, 0 insertions, 0 deletions