CE upstream - 2018-04-04 09:39 UTC
Files to resolve:
-
@blackst0ne Please resolve (UU) app/finders/issuable_finder.rb
-
@dzaporozhets Please resolve (UU) app/views/admin/application_settings/_form.html.haml
-
@fjsanpedro Please resolve (UU) lib/gitlab/auth/ldap/adapter.rb
-
@fjsanpedro Please resolve (UU) lib/gitlab/auth/o_auth/user.rb
-
@blackst0ne Please resolve (UU) spec/models/user_spec.rb
Try to resolve one file per commit, and then push (no force-push!) to the ce-to-ee-2018-04-04
branch.
Thanks in advance!
@fjsanpedro 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 Dmytro Zaporozhets (DZ)