Conflicts:

- app/services/search/global_service.rb
- app/services/search/project_service.rb
- app/services/search/snippet_service.rb
- app/views/profiles/accounts/show.html.haml