CE upstream - 2018-07-27 09:22 UTC
Files to resolve:
-
Jasper Maes Please resolve (UU) Gemfile.rails5.lock
-
Filipa Lacerda Please resolve (UU) spec/javascripts/pipelines/graph/graph_component_spec.js
-
@leipert 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-07-27
branch.
Thanks in advance!
@leipert 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 Lukas Eipert