CE upstream - 2018-04-24 12:36 UTC
Files to resolve:
-
@jamedjo Please resolve (AA) app/controllers/ldap/omniauth_callbacks_controller.rb
-
@jamedjo Please resolve (UU) config/routes/user.rb
-
@mayra-cabrera Please resolve (UU) doc/ci/variables/README.md
-
@tnir Please resolve (UU) doc/ci/yaml/README.md
-
@jamedjo Please resolve (UU) lib/gitlab/auth/ldap/user.rb
-
@jamedjo Please resolve (UU) lib/gitlab/auth/saml/user.rb
Try to resolve one file per commit, and then push (no force-push!) to the ce-to-ee-2018-04-24
branch.
Thanks in advance!
@jamedjo 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 Takuya Noguchi