CE upstream - 2018-02-23 12:10 UTC
Files to resolve:
-
@reprazent Please resolve (UU) app/controllers/groups/application_controller.rb
-
@reprazent Please resolve (UU) app/finders/issuable_finder.rb
-
@reprazent Please resolve (UU) app/policies/base_policy.rb
-
@reprazent Please resolve (UU) app/policies/merge_request_policy.rb
-
@reprazent Please resolve (UU) app/views/layouts/nav/sidebar/_group.html.haml
-
@reprazent Please resolve (UU) locale/gitlab.pot
Try to resolve one file per commit, and then push (no force-push!) to the ce-to-ee-2018-02-23
branch.
Thanks in advance!
@reprazent 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 Bob Van Landuyt