CE upstream - 2018-04-06 15:28 UTC
Files to resolve:
-
@jprovaznik Please resolve (UU) app/controllers/dashboard_controller.rb
-
@jacobvosmaer-gitlab Please resolve (UU) app/services/projects/update_pages_service.rb
-
@axil Please resolve (UU) doc/administration/index.md
-
@grzesiek Please resolve (UU) doc/ci/variables/README.md
-
@grzesiek Please resolve (UU) doc/ci/yaml/README.md
-
@grzesiek Please resolve (UU) spec/models/environment_spec.rb
Try to resolve one file per commit, and then push (no force-push!) to the ce-to-ee-2018-04-06
branch.
Thanks in advance!
@grzesiek 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 Stan Hu