CE upstream - Monday
Files to resolve:
-
@psimyn Please resolve (UU) app/assets/javascripts/dispatcher.js
-
@ClemMakesApps Please resolve (UU) app/assets/stylesheets/framework.scss
-
@marcia Please resolve (UU) doc/ci/autodeploy/index.md
-
@axil Please resolve (UU) doc/ci/examples/README.md
-
@axil Please resolve (AA) doc/ci/examples/dast.md
-
@axil Please resolve (AA) doc/ci/examples/sast_docker.md
-
@marcia Please resolve (UU) doc/install/README.md
-
@marcia Please resolve (UU) doc/topics/autodevops/index.md
-
Jacob Vosmaer Please resolve (UU) spec/spec_helper.rb
Try to resolve one file per commit, and then push (no force-push!) to the ce-to-ee-2018-01-15
branch.
Thanks in advance!
@axil 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 Rémy Coutable