CE upstream - Friday
Files to resolve:
-
@yorickpeterse Please resolve (UU) Gemfile.lock
-
@ClemMakesApps Please resolve (UU) app/assets/javascripts/dispatcher.js
-
Jacopo Please resolve (UU) app/controllers/omniauth_callbacks_controller.rb
-
Jacopo Please resolve (UU) app/helpers/nav_helper.rb
-
@yorickpeterse Please resolve (UU) app/models/issue.rb
-
@yorickpeterse Please resolve (UU) app/models/merge_request.rb
-
@yorickpeterse Please resolve (UU) app/models/namespace.rb
-
@jivanvl Please resolve (UU) db/schema.rb
-
John Doe Please resolve (UU) doc/ci/examples/README.md
-
@iamphill Please resolve (UU) spec/javascripts/boards/mock_data.js
Try to resolve one file per commit, and then push (no force-push!) to the ce-to-ee-2018-01-12
branch.
Thanks in advance!
@yorickpeterse 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 Luke Bennett