CE upstream - 2018-10-24 16:21 UTC
Files to resolve:
-
@godfat Please resolve (UU) .gitlab-ci.yml
-
@samdbeckham Please resolve (UU) app/helpers/groups_helper.rb
-
George Tsiolis Please resolve (UU) app/views/layouts/_page.html.haml
-
Elan Ruusamäe Please resolve (UU) doc/ci/yaml/README.md
-
@danielgruesso Please resolve (UU) doc/topics/autodevops/index.md
-
@stanhu Please resolve (UU) locale/gitlab.pot
Try to resolve one file per commit, and then push (no force-push!) to the ce-to-ee-2018-10-24
branch.
Thanks in advance!
@samdbeckham 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