CE-to-EE `master` for RC1 (!262) · Merge requests · GitLab.org / GitLab · GitLab

Do not update/delete: Banner broadcast message test data

Do not update/delete: Notification broadcast message test data

Robert Speicher requested to merge ce-to-ee into master Mar 14, 2016

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

@yorickpeterse The Elasticsearch classes are expecting project IDs. I think the simplest solution for now is to map the relation to project IDs.

@iamphill Please fix the conflict in the view.