diff options
| author | Douwe Maan <douwe@gitlab.com> | 2016-02-22 00:38:51 +0000 |
|---|---|---|
| committer | Douwe Maan <douwe@gitlab.com> | 2016-02-22 00:38:51 +0000 |
| commit | 28f9b54372cd2d7b7ac930c2a4968ca435382851 (patch) | |
| tree | 0c25395e1f5bb5a0578b35ead0be006baf5b6cd8 /app/models/note.rb | |
| parent | 1367caa642e7ec9a46f202b6149a01e7093c573d (diff) | |
| parent | 6febe1007ef6fec4507d81a5579c2766cd188a17 (diff) | |
| download | gitlab-ce-28f9b54372cd2d7b7ac930c2a4968ca435382851.tar.gz | |
Merge branch 'merge-when-succeeded' into 'master'
Fix bugs in MergeWhenSucceeded
1. This fixes support for merge when succeeded for statuses without ref.
2. This fixes support for merge when succeeded for multiple stages. Stages are created after all builds for previous one are finished.
Fixes: https://gitlab.com/gitlab-org/gitlab-ce/issues/9060 https://gitlab.com/gitlab-org/gitlab-ce/issues/8108 https://gitlab.com/gitlab-org/gitlab-ce/issues/12931 https://gitlab.com/gitlab-org/gitlab-ce/issues/13269
/cc @grzesiek @DouweM @rspeicher
See merge request !2894
Diffstat (limited to 'app/models/note.rb')
0 files changed, 0 insertions, 0 deletions