CE upstream - 2018-07-05 12:27 UTC
Files to resolve:
-
@ifarkas Please resolve (UU) app/assets/stylesheets/pages/settings.scss
-
@dennis Please resolve (UU) app/controllers/projects/clusters_controller.rb
-
@jprovaznik Please resolve (UU) app/models/group.rb
-
@smcgivern Please resolve (UU) app/workers/project_cache_worker.rb
-
@winh Please resolve (UU) spec/features/admin/admin_settings_spec.rb
-
@winh Please resolve (UU) spec/features/projects/members/share_with_group_and_members_spec.rb
-
@winh Please resolve (UU) spec/features/protected_branches_spec.rb
-
@smcgivern Please resolve (UU) spec/workers/project_cache_worker_spec.rb
Try to resolve one file per commit, and then push (no force-push!) to the ce-to-ee-2018-07-05
branch.
Thanks in advance!
@winh 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 Inactive Account