diff options
| author | Douwe Maan <douwe@gitlab.com> | 2016-11-23 10:13:29 +0000 |
|---|---|---|
| committer | Douwe Maan <douwe@gitlab.com> | 2016-11-23 10:13:29 +0000 |
| commit | db02af3e2496203890c9ab1aa5a17eb891071682 (patch) | |
| tree | 4116bb60b828d4ec543332e09f5f1225a5c98e50 /changelogs | |
| parent | 9f7fc6a0434399170ce1b089a6b00e11d0880f16 (diff) | |
| parent | b938aa5cc83ffb51b516c7abfaaf6fe5e37031a6 (diff) | |
| download | gitlab-ce-db02af3e2496203890c9ab1aa5a17eb891071682.tar.gz | |
Merge branch 'fix/cycle-analytics-plan-issue' into 'master'
Fix cycle analytics plan stage when commits are missing
Takes into account when commits are `nil` so the app doesn't throw an exception and also removes them.
Fixes https://gitlab.com/gitlab-org/gitlab-ce/issues/24836
- [x] [Changelog entry](https://docs.gitlab.com/ce/development/changelog.html) added
- Tests
- [x] Added for this feature/bug
- [x] All builds are passing
- [x] Conform by the [merge request performance guides](http://docs.gitlab.com/ce/development/merge_request_performance_guidelines.html)
- [x] Conform by the [style guides](https://gitlab.com/gitlab-org/gitlab-ce/blob/master/CONTRIBUTING.md#style-guides)
- [x] Branch has no merge conflicts with `master` (if it does - rebase it please)
- [ ] [Squashed related commits together](https://git-scm.com/book/en/Git-Tools-Rewriting-History#Squashing-Commits)
See merge request !7694
Diffstat (limited to 'changelogs')
| -rw-r--r-- | changelogs/unreleased/fix-cycle-analytics-plan-issue.yml | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/changelogs/unreleased/fix-cycle-analytics-plan-issue.yml b/changelogs/unreleased/fix-cycle-analytics-plan-issue.yml new file mode 100644 index 00000000000..6ed16c6d722 --- /dev/null +++ b/changelogs/unreleased/fix-cycle-analytics-plan-issue.yml @@ -0,0 +1,4 @@ +--- +title: Fix cycle analytics plan stage when commits are missing +merge_request: +author: |