diff options
| author | Douwe Maan <douwe@gitlab.com> | 2017-07-07 20:52:17 +0000 |
|---|---|---|
| committer | Douwe Maan <douwe@gitlab.com> | 2017-07-07 20:52:17 +0000 |
| commit | 94e2a286846ee8b8b36ac29ccae7d51cb19578d5 (patch) | |
| tree | 6c85174841a33bf75e4be48cbe8814b4c3e36b27 /config/application.rb | |
| parent | ac09bbdc18eed278cf7f1b6d24acc27a879ab00f (diff) | |
| parent | 6d28ad844d154eb8f7b9b7b8683b42ce70101789 (diff) | |
| download | gitlab-ce-94e2a286846ee8b8b36ac29ccae7d51cb19578d5.tar.gz | |
Merge branch 'feature/user-datetime-search-api-mysql' into 'master'
Add creation time filters to user search API for admins
Closes #29507
See merge request !12682
Diffstat (limited to 'config/application.rb')
| -rw-r--r-- | config/application.rb | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/config/application.rb b/config/application.rb index d88740ef8d7..2f4e2624195 100644 --- a/config/application.rb +++ b/config/application.rb @@ -26,7 +26,8 @@ module Gitlab #{config.root}/app/models/members #{config.root}/app/models/project_services #{config.root}/app/workers/concerns - #{config.root}/app/services/concerns)) + #{config.root}/app/services/concerns + #{config.root}/app/finders/concerns)) config.generators.templates.push("#{config.root}/generator_templates") |