peoplegroup-connectors 0.1.61 → 0.1.62

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 2e59dce9e0a49509f7d7d224419117938e46a4ac2f734a50338c585c5e767a1e
-  data.tar.gz: f4d2795919f9a057fe39c2ad2fd1791e6af24c35eedd2ee36d1320a35ea44ddd
+  metadata.gz: 63e558e3b0b23937bc35569600026b755d8df4b16d30b4d4d7598bba6284b1e3
+  data.tar.gz: fce5ddb020adc11c9a323b6c47fe9c6ae57e1e9a3c546b8c2ecb74c41c8fcbe6
 SHA512:
-  metadata.gz: 44d2a74d27ce7435b88ad1ebbe8d6c4006b2010ca6baa08db4a6fa490171c67480336c65a2cc6e81d4fb1c73d7babff21c0d553e3239b0960ee44fe034113ac1
-  data.tar.gz: bc28647937a2043f81224906bb62483d6b1735bf02d810cc13175e262af997bf5d0934cb26d0f21e618565678f35e7776bea8de31091c57393f74d3984912934
+  metadata.gz: 359d52f20f5eb1166a79b8e2a39c431811ee0ca3dc84d49defde2c81dcff11a2fcc02d4adf5e8be4a64e58c61ed2d62df4bf9d5af070446fb7bfd3e4d7ba68ce
+  data.tar.gz: 5944fa5d2962193be9cd49f6f29ad04fcb2077e9cf11a28cc51e2f1dc5be51b5dcb7b9632019b57949b3e147aaeae1cc85d405dc75c276648f0efd243bce42a2

data/lib/peoplegroup/connectors/gitlab.rb

@@ -72,8 +72,8 @@ module PeopleGroup
         epic || retry_on_error { @client.create_epic(group_id, title, options) }
       end
 
-      def commit_new_files_to_new_merge_request(project_id, branch_name, new_files, commit_message, description = nil)
-        retry_on_error { @client.create_branch(project_id, branch_name, 'master') }
+      def commit_new_files_to_new_merge_request(project_id, branch_name, new_files, commit_message, description = nil, target_branch: 'master')
+        retry_on_error { @client.create_branch(project_id, branch_name, target_branch) }
         actions = []
         new_files.each do |file|
           actions << {
@@ -85,7 +85,7 @@ module PeopleGroup
 
         retry_on_error { @client.create_commit(project_id, branch_name, commit_message, actions) }
 
-        options = { source_branch: branch_name, target_branch: 'master', remove_source_branch: true }
+        options = { source_branch: branch_name, target_branch: target_branch, remove_source_branch: true }
         options[:description] = description if description
         retry_on_error { @client.create_merge_request(project_id, commit_message, options) }
       end
@@ -120,8 +120,8 @@ module PeopleGroup
         retry_on_error { @client.create_merge_request(project_id, commit_message, options) }
       end
 
-      def commit_change_to_new_merge_request(project_id, branch_name, file_path, file_with_change, commit_message, description = nil)
-        retry_on_error { @client.create_branch(project_id, branch_name, 'master') }
+      def commit_change_to_new_merge_request(project_id, branch_name, file_path, file_with_change, commit_message, description = nil, target_branch: 'master')
+        retry_on_error { @client.create_branch(project_id, branch_name, target_branch) }
         actions = [
           {
             action: 'update',
@@ -131,7 +131,7 @@ module PeopleGroup
         ]
         retry_on_error { @client.create_commit(project_id, branch_name, commit_message, actions) }
 
-        options = { source_branch: branch_name, target_branch: 'master', remove_source_branch: true }
+        options = { source_branch: branch_name, target_branch: target_branch, remove_source_branch: true }
         options[:description] = description if description
         retry_on_error { @client.create_merge_request(project_id, commit_message, options) }
       end

data/lib/peoplegroup/connectors/version.rb

@@ -2,6 +2,6 @@
 
 module PeopleGroup
   module Connectors
-    VERSION = '0.1.61'
+    VERSION = '0.1.62'
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: peoplegroup-connectors
 version: !ruby/object:Gem::Version
-  version: 0.1.61
+  version: 0.1.62
 platform: ruby
 authors:
 - lien van den steen
-autorequire: 
+autorequire:
 bindir: bin
 cert_chain: []
-date: 2021-07-01 00:00:00.000000000 Z
+date: 2021-07-05 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: gitlab
@@ -190,7 +190,7 @@ metadata:
   homepage_uri: https://gitlab.com/gitlab-com/people-group/peopleops-eng/connectors-gem
   source_code_uri: https://gitlab.com/gitlab-com/people-group/peopleops-eng/connectors-gem
   changelog_uri: https://gitlab.com/gitlab-com/people-group/peopleops-eng/connectors-gem
-post_install_message: 
+post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -205,8 +205,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.2.3
-signing_key: 
+rubygems_version: 3.1.4
+signing_key:
 specification_version: 4
 summary: Library for our shared connectors.
 test_files: []