CE upstream - 2018-03-27 08:13 UTC
Files to resolve:
-
@grzesiek Please resolve (UU) app/models/ci/pipeline.rb
-
@grzesiek Please resolve (UU) app/services/ci/create_pipeline_service.rb
-
@grzesiek Please resolve (UU) app/services/ci/pipeline_trigger_service.rb
-
@dzaporozhets Please resolve (UU) app/views/admin/application_settings/_form.html.haml
-
@dzaporozhets Please resolve (UU) spec/features/admin/admin_settings_spec.rb
-
@grzesiek Please resolve (AA) spec/lib/gitlab/ci/pipeline/chain/populate_spec.rb
-
@grzesiek Please resolve (UU) spec/models/ci/pipeline_spec.rb
Try to resolve one file per commit, and then push (no force-push!) to the ce-to-ee-2018-03-27
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 Dmytro Zaporozhets (DZ)