Merge remote-tracking branch 'upstream/master' into ce-to-ee-2018-03-23
# Conflicts: # app/helpers/application_settings_helper.rb # app/models/group.rb # db/schema.rb # spec/initializers/6_validations_spec.rb # spec/lib/gitlab/import_export/safe_model_attributes.yml [ci skip]
Showing
Please register or sign in to comment