CE upstream - 2018-03-01 21:23 UTC
Files to resolve:
-
Horatiu Eugen Vlad Please resolve (UU) app/helpers/auth_helper.rb
-
Horatiu Eugen Vlad Please resolve (AA) lib/gitlab/auth/ldap/access.rb
-
Horatiu Eugen Vlad Please resolve (AA) lib/gitlab/auth/ldap/adapter.rb
-
Horatiu Eugen Vlad Please resolve (AA) lib/gitlab/auth/ldap/config.rb
-
Horatiu Eugen Vlad Please resolve (AA) lib/gitlab/auth/ldap/person.rb
-
Horatiu Eugen Vlad Please resolve (AA) lib/gitlab/auth/ldap/user.rb
-
Horatiu Eugen Vlad Please resolve (AA) lib/gitlab/auth/o_auth/auth_hash.rb
-
Horatiu Eugen Vlad Please resolve (AA) lib/gitlab/auth/o_auth/user.rb
-
Horatiu Eugen Vlad Please resolve (AA) lib/gitlab/auth/saml/config.rb
-
Horatiu Eugen Vlad Please resolve (AA) lib/gitlab/auth/saml/user.rb
-
Horatiu Eugen Vlad Please resolve (UA) spec/lib/gitlab/auth/ldap/access_spec.rb
-
@DouweM Please resolve (UU) spec/lib/gitlab/auth/ldap/user_spec.rb
-
@DouweM Please resolve (UU) spec/support/ldap_helpers.rb
Try to resolve one file per commit, and then push (no force-push!) to the ce-to-ee-2018-03-01
branch.
Thanks in advance!
@DouweM 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 Francisco Javier López (ex-Gitlab)