CE upstream - 2018-08-29 20:05 UTC
Files to resolve:
-
@gitlab-release-tools-bot Please resolve (UU) CHANGELOG.md
-
@rymai Please resolve (AA) qa/qa/specs/features/browser_ui/3_create/repository/create_edit_delete_file_via_web_spec.rb
-
@rymai Please resolve (AA) qa/qa/specs/features/browser_ui/4_verify/pipeline/create_and_process_pipeline_spec.rb
-
@rymai Please resolve (AA) qa/qa/specs/features/browser_ui/6_release/deploy_key/clone_using_deploy_key_spec.rb
Try to resolve one file per commit, and then push (no force-push!) to the ce-to-ee-2018-08-29
branch.
Thanks in advance!
@rymai 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 Jose Ivan Vargas