Adopt branch to upstream changes

modules/bcf/app/controllers/bcf/issues_controller.rb

@@ -167,7 +167,7 @@ module ::Bcf
     end
 
     def render_config_unknown_mails
-      @roles = Role.find_all_givable
+      @roles = Role.givable
       render 'bcf/issues/configure_unknown_mails'
     end
 
@@ -176,7 +176,7 @@ module ::Bcf
     end
 
     def render_config_non_members
-      @roles = Role.find_all_givable
+      @roles = Role.givable
       render 'bcf/issues/configure_non_members'
     end
 

modules/bcf/lib/open_project/bcf/bcf_xml/importer.rb

@@ -88,7 +88,7 @@ module OpenProject::Bcf::BcfXml
 
     def add_unknown_mail(mail, options)
       user = UserInvitation.invite_new_user(email: mail)
-      member = Member.create(user: user,
+      member = Member.create(principal: user,
                              project: project)
       membership_service = ::Members::EditMembershipService.new(member,
                                                                 save: true,
@@ -97,7 +97,7 @@ module OpenProject::Bcf::BcfXml
     end
 
     def add_non_member(user, options)
-      member = Member.create(user: user,
+      member = Member.create(principal: user,
                              project: project)
       membership_service = ::Members::EditMembershipService.new(member,
                                                                 save: true,

modules/bcf/lib/open_project/bcf/bcf_xml/issue_reader.rb

@@ -108,11 +108,9 @@ module OpenProject::Bcf::BcfXml
     end
 
     def create_work_package
-      wp = WorkPackage.new work_package_attributes
-
-      call = CreateWorkPackageService
-        .new(user: user)
-        .call(wp, send_notifications: false)
+      call = WorkPackages::CreateService.new(user: user).call(work_package_attributes
+                                                                .merge(send_notifications: false)
+                                                                .symbolize_keys)
 
       if call.success?
         force_overwrite(wp)