diff options
| author | Go MAEDA <maeda@farend.jp> | 2018-12-07 00:54:38 +0000 |
|---|---|---|
| committer | Go MAEDA <maeda@farend.jp> | 2018-12-07 00:54:38 +0000 |
| commit | b543e7dc35296d8c60a3151cb28f487cf60778fb (patch) | |
| tree | f5ca67724492aa9d212dc59d7c9f7ac7946fb9df /app | |
| parent | 57bfd3a1867b5e929c268f4ceb0f360a37bfd587 (diff) | |
| download | redmine-b543e7dc35296d8c60a3151cb28f487cf60778fb.tar.gz redmine-b543e7dc35296d8c60a3151cb28f487cf60778fb.zip | |
Merged r17692 from trunk to 3.4-stable (#28636).
git-svn-id: http://svn.redmine.org/redmine/branches/3.4-stable@17693 e93f8b46-1217-0410-a6f0-8f06a7374b81
Diffstat (limited to 'app')
| -rw-r--r-- | app/controllers/search_controller.rb | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/app/controllers/search_controller.rb b/app/controllers/search_controller.rb index 36bae860a..486029fc9 100644 --- a/app/controllers/search_controller.rb +++ b/app/controllers/search_controller.rb @@ -49,7 +49,7 @@ class SearchController < ApplicationController when 'my_projects' User.current.projects when 'subprojects' - @project ? (@project.self_and_descendants.active.to_a) : nil + @project ? (@project.self_and_descendants.to_a) : nil else @project end |