Wednesday CE upstream (!1116) · 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 rc/ce-upstream into master Jan 25, 2017

Resolved conflicts:

UU app/models/application_setting.rb
UU config/initializers/metrics.rb
UU doc/user/permissions.md
UU doc/workflow/README.md
UU spec/models/user_spec.rb
UU spec/services/merge_requests/refresh_service_spec.rb