Merge branch 'master' of https://github.com/jenkinsci/jenkins into updates

This commit is contained in:
Johannes Ernst committed 2015-12-10 03:12:42 +00:00
commit ec92ff2f59
90 files changed
+3433 -155

No files matched your search

@@ -876,6 +876,7 @@ public abstract class PluginManager extends AbstractModelObject implements OnMas
/**
* Bare-minimum configuration mechanism to change the update center.
*/
@RequirePOST
public HttpResponse doSiteConfigure(@QueryParameter String site) throws IOException {
Jenkins hudson = Jenkins.getInstance();
hudson.checkPermission(CONFIGURE_UPDATECENTER);
@@ -891,6 +892,7 @@ public abstract class PluginManager extends AbstractModelObject implements OnMas
}
@RequirePOST
public HttpResponse doProxyConfigure(StaplerRequest req) throws IOException, ServletException {
Jenkins jenkins = Jenkins.getInstance();
jenkins.checkPermission(CONFIGURE_UPDATECENTER);
@@ -909,6 +911,7 @@ public abstract class PluginManager extends AbstractModelObject implements OnMas
/**
* Uploads a plugin.
*/
@RequirePOST
public HttpResponse doUploadPlugin(StaplerRequest req) throws IOException, ServletException {
try {
Jenkins.getInstance().checkPermission(UPLOAD_PLUGINS);