remove condition

Author: yaroslaw.ekimov

JenkinsfileRelease

@@ -114,19 +114,18 @@ def publishGem()
 
 node('words-linux') {
 	   stage('Merge master to release'){
-		if (params.branch.contains("master")) {
-				checkout([$class: 'GitSCM', branches: [[name: '*/release']], doGenerateSubmoduleConfigurations: false, extensions: [[$class: 'LocalBranch', localBranch: "**"]], submoduleCfg: [], userRemoteConfigs: [[credentialsId: '361885ba-9425-4230-950e-0af201d90547', url: 'https://git.auckland.dynabic.com/words-cloud/words-cloud-ruby.git']]])
-				sh "git config user.email '[email protected]'"
-				sh "git config user.name 'jenkins'"
-				sh "git checkout --merge release"
-				sh "git reset --hard origin/release"
-				sh "git merge --no-ff --allow-unrelated-histories origin/master"
-				sh "git diff --name-status"			
-				sh 'git commit -am "Merged master branch to release" || exit 0'
-				withCredentials([usernamePassword(credentialsId: '361885ba-9425-4230-950e-0af201d90547', passwordVariable: 'gitPass', usernameVariable: 'gitUsername')]) {
-					sh "git push https://$gitUsername:[email protected]/words-cloud/words-cloud-ruby.git release"
-				}
-		}  
+			checkout([$class: 'GitSCM', branches: [[name: '*/release']], doGenerateSubmoduleConfigurations: false, extensions: [[$class: 'LocalBranch', localBranch: "**"]], submoduleCfg: [], userRemoteConfigs: [[credentialsId: '361885ba-9425-4230-950e-0af201d90547', url: 'https://git.auckland.dynabic.com/words-cloud/words-cloud-ruby.git']]])
+			sh "git config user.email '[email protected]'"
+			sh "git config user.name 'jenkins'"
+			sh "git checkout --merge release"
+			sh "git reset --hard origin/release"
+			sh "git merge --no-ff --allow-unrelated-histories origin/master"
+			sh "git diff --name-status"			
+			sh 'git commit -am "Merged master branch to release" || exit 0'
+			withCredentials([usernamePassword(credentialsId: '361885ba-9425-4230-950e-0af201d90547', passwordVariable: 'gitPass', usernameVariable: 'gitUsername')]) {
+				sh "git push https://$gitUsername:[email protected]/words-cloud/words-cloud-ruby.git release"
+			}
+		
 	}
 	try {
 		testGemLocally()