diff options
| author | Rémy Coutable <remy@rymai.me> | 2016-07-18 16:42:35 +0300 |
|---|---|---|
| committer | Rémy Coutable <remy@rymai.me> | 2016-07-18 16:42:35 +0300 |
| commit | 017ae313dc84682e260e960f93fb4a55af0df523 (patch) | |
| tree | a4988dd7960c1730fb9a69e819e09321803c9795 /spec/helpers/time_helper_spec.rb | |
| parent | f6c6e91d9ff81bddac8a0143d96b09b396000a46 (diff) | |
| parent | 87035c294502451708262d68e228f7cb9e244552 (diff) | |
Merge branch '19928-nomethoderror-undefined-method-id-for-nil-nilclass' into 'master'
Don't blow up in tree view on empty repo
## What does this MR do?
Stop the empty repo page blowing up with a 500 error when a user's default view is tree view.
## Are there points in the code the reviewer needs to double check?
Don't think so.
## Why was this MR needed?
https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/4997 made sure that the `tree` filter was only called if the user's default project view is tree, but left out the empty repo check. When users visit an empty repo with the tree view as default, they now get a 500.
## What are the relevant issue numbers?
Closes #19928.
## Screenshots (if relevant)
## Does this MR meet the acceptance criteria?
- ~~[CHANGELOG](https://gitlab.com/gitlab-org/gitlab-ce/blob/master/CHANGELOG) entry added~~ (bug introduced in same release)
- ~~[Documentation created/updated](https://gitlab.com/gitlab-org/gitlab-ce/blob/master/doc/development/doc_styleguide.md)~~
- ~~API support added~~
- Tests
- ~~Added for this feature/bug~~
- [ ] All builds are passing
- [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 you do - rebase it please)
- [x] [Squashed related commits together](https://git-scm.com/book/en/Git-Tools-Rewriting-History#Squashing-Commits)
See merge request !5317
Diffstat (limited to 'spec/helpers/time_helper_spec.rb')
0 files changed, 0 insertions, 0 deletions