CE upstream - 2018-11-13 17:21 UTC
Files to resolve:
-
@yorickpeterse Please resolve (AA) app/models/identity/uniqueness_scopes.rb
-
@gonzoyumo Please resolve (UU) doc/ci/examples/browser_performance.md
-
@gonzoyumo Please resolve (UU) doc/ci/examples/code_quality.md
-
@gonzoyumo Please resolve (UU) doc/ci/examples/container_scanning.md
-
@gonzoyumo Please resolve (UU) doc/ci/examples/dast.md
-
@gonzoyumo Please resolve (UU) doc/ci/yaml/README.md
Try to resolve one file per commit, and then push (no force-push!) to the ce-to-ee-2018-11-13
branch.
Thanks in advance!
@gonzoyumo 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 Olivier Gonzalez