fix: #636 fix Jenkins won't trigger a build of merge commit on merged…

CHANGELOG.md

@@ -1,6 +1,10 @@
 ChangeLog
 
-1.5.14 - to be released
+1.5.15 - 1.5.19
+=====================
+**TODO**
+
+1.5.14
 =====================
 * #866: Better compatibility with Configuration as Code plugin (useAuthenticatedEndpoint)
 

README.md

@@ -39,7 +39,7 @@ This plugin allows GitLab to trigger builds in Jenkins when code is committed or
 
 ### Seeking maintainers
 
-I am no longer using GitLab on a daily basis, and therefore I have less time to spend working on the plugin. If you are a regular user and would like to help out, please consider volunteering as a maintainer. There are verified bugs that need fixes, open PRs that need review, and feature requests that range from simple to complex. If you are interested in contributing, contact Marky (email address in git log) for additional access.
+**This plugin is not maintained!** I no longer have the time or available infrastructure to test PRs. If you are willing to invest some time in this, please comment on https://github.com/jenkinsci/gitlab-plugin/issues/1115 to request access.
 
 # User support
 ### Relationship with GitLab Inc.
@@ -171,23 +171,24 @@ In your job configuration, click 'This build is parameterized' and add any param
 In the Groovy Script field insert something similar to:
 
 ```
-import hudson.model.*
-def env = Thread.currentThread()?.executable.parent.builds[0].properties.get('envVars')
+def env = currentBuild.getEnvironment(currentListener)
 def map = [:]
 
-if (env['gitlabSourceBranch'] != null) { 
-  map['sourceBranch'] = env['gitlabSourceBranch'] 
+if (env.gitlabSourceBranch != null) {
+  map['sourceBranch'] = env.gitlabSourceBranch
 }
-if (env['gitlabTargetBranch'] != null) { 
-  map['targetBranch'] = env['gitlabTargetBranch'] 
+
+if (env.gitlabTargetBranch != null) {
+  map['targetBranch'] = env.gitlabTargetBranch
 }
-// Add additional entries for any other parameters you have created
 
 return map
 ```
 
 You can then reference these variables in your job config, e.g. as `${sourceBranch}`. You will need to update this code anytime you add or remove parameters.
 
+Note: If you use the Groovy Sandbox, you might need to approve the script yourself or let an administrator approve the script in the Jenkins configuration.
+
 ## Git configuration 
 ### Freestyle jobs
 In the *Source Code Management* section:
@@ -213,9 +214,7 @@ In the *Source Code Management* section:
 checkout changelog: true, poll: true, scm: [
     $class: 'GitSCM',
     branches: [[name: "origin/${env.gitlabSourceBranch}"]],
-    doGenerateSubmoduleConfigurations: false,
     extensions: [[$class: 'PreBuildMerge', options: [fastForwardMode: 'FF', mergeRemote: 'origin', mergeStrategy: 'DEFAULT', mergeTarget: "${env.gitlabTargetBranch}"]]],
-    submoduleCfg: [],
     userRemoteConfigs: [[name: 'origin', url: 'git@gitlab.example.com:foo/testrepo.git']]
     ]
 ```