CE upstream - 2018-03-23 18:25 UTC
Files to resolve:
-
@jacobvosmaer-gitlab Please resolve (UU) app/helpers/application_settings_helper.rb
-
@tiagonbotelho Please resolve (UU) app/models/group.rb
-
@dbalexandre Please resolve (UU) db/schema.rb
-
@jacobvosmaer-gitlab Please resolve (UU) spec/initializers/6_validations_spec.rb
-
@reprazent Please resolve (UU) spec/lib/gitlab/import_export/safe_model_attributes.yml
Try to resolve one file per commit, and then push (no force-push!) to the ce-to-ee-2018-03-23
branch.
Thanks in advance!
@jacobvosmaer-gitlab After you resolved the conflicts, please assign to the next person. If you're the last one to resolve the conflicts, please push this to be merged.
Note: This merge request was created by an automated script. Please report any issue at https://gitlab.com/gitlab-org/release-tools/issues!
Edited by Stan Hu