CE upstream - 2018-11-02 14:21 UTC
Files to resolve:
-
@tkuah Please resolve (AA) app/controllers/concerns/project_unauthorized.rb
-
@tkuah Please resolve (UU) app/controllers/projects/clusters_controller.rb
-
@tkuah Please resolve (UU) app/helpers/clusters_helper.rb
-
@tkuah Please resolve (UU) app/views/clusters/clusters/_integration_form.html.haml
-
@tkuah Please resolve (UU) config/routes.rb
Try to resolve one file per commit, and then push (no force-push!) to the ce-to-ee-2018-11-02
branch.
Thanks in advance!
@tkuah 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 Kamil Trzciński