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.

More detailed instructions

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!

marked the checklist item @dbalexandre Please resolve (UU) db/schema.rb as completed

added 1 commit

• 91112906 - Resolve conflict on db/schema.rb

Compare with previous version

added 1 commit

• df179a2d - Resolve conflict in `safe_model_attributes.yml`

Compare with previous version

marked the checklist item @reprazent Please resolve (UU) spec/lib/gitlab/import_export/safe_model_attributes.yml as completed

added 1 commit

• 2822861e - Resolve conflict in app/helpers/application_settings_helper.rb

Compare with previous version

marked the checklist item @jacobvosmaer-gitlab Please resolve (UU) app/helpers/application_settings_helper.rb as completed

added 2 commits

• c6ebb26a - Resolve conflicts in spec/initializers/6_validations_spec.rb
• f30448e8 - Make CE and EE files consistent in spec/initializers/6_validations_spec.rb

Compare with previous version

marked the checklist item @jacobvosmaer-gitlab Please resolve (UU) spec/initializers/6_validations_spec.rb as completed

added 1 commit

• 8a5b3f8d - Resolve conflicts in app/models/group.rb

Compare with previous version

marked the checklist item @tiagonbotelho Please resolve (UU) app/models/group.rb as completed

assigned to @stanhu

@eReGeBe I took the liberty of making CE and EE files of spec/initializers/6_validations_spec.rb match. As far as I could tell, there were no EE-specific changes, and EE was missing some of the changes made in CE. Please check.

approved this merge request

enabled an automatic merge when the pipeline for 8a5b3f8d succeeds

added 1 commit

• 954ad7e9 - Merge branch '28857-followup-fix-pages-test' into 'master'

Compare with previous version

approved this merge request

enabled an automatic merge when the pipeline for 954ad7e9 succeeds

Failure of the sast job caused by https://gitlab.com/gitlab-org/gitlab-ce/issues/44619

canceled the automatic merge

merged

mentioned in commit b38f4bbf

Thanks for fixing my merge conflicts @stanhu

added Enterprise Edition label