CE upstream - 2018-10-17 22:21 UTC
Files to resolve:
-
@gitlab-release-tools-bot Please resolve (UU) CHANGELOG.md
-
@nick.thomas Please resolve (UU) Gemfile.lock
-
@nick.thomas Please resolve (UU) Gemfile.rails5.lock
-
@filipa Please resolve (UU) app/assets/javascripts/jobs/components/job_app.vue
-
@filipa Please resolve (UU) app/assets/javascripts/jobs/store/getters.js
-
@winh Please resolve (UU) app/assets/javascripts/pipelines/components/graph/stage_column_component.vue
-
@filipa Please resolve (UU) locale/gitlab.pot
-
Aleksandr Soborov Please resolve (UU) qa/qa/page/project/menu.rb
-
@winh Please resolve (UU) spec/javascripts/pipelines/graph/stage_column_component_spec.js
Try to resolve one file per commit, and then push (no force-push!) to the ce-to-ee-2018-10-17
branch.
Thanks in advance!
@filipa 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 Filipa Lacerda