CE upstream - Wednesday
Files to resolve:
-
@rymai Please resolve (UU) Gemfile.lock
-
@MadLittleMods Please resolve (UU) app/assets/javascripts/dispatcher.js
-
@MadLittleMods Please resolve (AA) changelogs/unreleased-ee/4378-fix-cluster-js-not-running-on-update-page.yml
-
@matteeyah Please resolve (UU) spec/requests/api/jobs_spec.rb
-
@matteeyah Please resolve (UU) spec/requests/api/v3/builds_spec.rb
Try to resolve one file per commit, and then push (no force-push!) to the ce-to-ee-2018-01-17
branch.
Thanks in advance!
@matteeyah 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 Matija Čupić