CE to EE following update of `db/schema.rb` with `activerecord_sane_schema_dumper` (!800) · Merge requests · GitLab.org / GitLab · GitLab

Do not update/delete: Banner broadcast message test data

Do not update/delete: Notification broadcast message test data

username-removed-128633 requested to merge ce-to-ee into master Oct 12, 2016

Resolved conflicts:

UU app/controllers/projects/merge_requests_controller.rb
UU app/helpers/merge_requests_helper.rb
UU app/views/projects/merge_requests/widget/_open.html.haml
UU db/schema.rb
UU doc/README.md
UU spec/lib/extracts_path_spec.rb
UU spec/services/merge_requests/refresh_service_spec.rb