Merge pull request #205 from dazjones/admin-consolidation

Darren Jones · web-flow · commit b98edd0a3ff7 · 2018-05-09T13:30:48.000+01:00
consolidated admins
diff --git a/jobs/jenkins-master/templates/config/configure-github-access.groovy.erb b/jobs/jenkins-master/templates/config/configure-github-access.groovy.erb
@@ -16,7 +16,7 @@ if(!github_realm.equals(Jenkins.instance.getSecurityRealm())) {
     Jenkins.instance.save()
 }
 
-String adminUserNames = '<%= p('jenkins.github.oauth.admins.admin1') %>,<%= p('jenkins.github.oauth.admins.admin2') %>,<%= p('jenkins.github.oauth.admins.admin3') %>'
+String adminUserNames = '<%= p('jenkins.github.oauth.admins') %>'
 String organizationNames = '<%= p('jenkins.github.oauth.org_name')  %>'
 boolean useRepositoryPermissions = true
 boolean authenticatedUserReadPermission = false

Original file line number	Diff line number	Diff line change
`@@ -16,7 +16,7 @@ if(!github_realm.equals(Jenkins.instance.getSecurityRealm())) {`
`16`	`16`	`Jenkins.instance.save()`
`17`	`17`	`}`
`18`	`18`
`19`		`-String adminUserNames = '<%= p('jenkins.github.oauth.admins.admin1') %>,<%= p('jenkins.github.oauth.admins.admin2') %>,<%= p('jenkins.github.oauth.admins.admin3') %>'`
	`19`	`+String adminUserNames = '<%= p('jenkins.github.oauth.admins') %>'`
`20`	`20`	`String organizationNames = '<%= p('jenkins.github.oauth.org_name') %>'`
`21`	`21`	`boolean useRepositoryPermissions = true`
`22`	`22`	`boolean authenticatedUserReadPermission = false`