CE upstream - 2018-11-19 17:21 UTC
Files to resolve:
-
@rymai Please resolve (UU) Gemfile.lock
-
@stanhu Please resolve (AA) app/services/projects/disable_deploy_key_service.rb
-
@engwan Please resolve (UU) app/views/dashboard/merge_requests.html.haml
-
@ifarkas Please resolve (UU) app/views/devise/shared/_tabs_ldap.html.haml
-
Kai Schröer Please resolve (UU) doc/install/requirements.md
-
@leipert Please resolve (UU) package.json
-
@stanhu Please resolve (UU) spec/controllers/projects/deploy_keys_controller_spec.rb
Try to resolve one file per commit, and then push (no force-push!) to the ce-to-ee-2018-11-19
branch.
Thanks in advance!
@stanhu 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 Stan Hu