Merge branch 'release/1.13.6'

api/portainer.go

@@ -305,7 +305,7 @@ type (
 
 const (
 	// APIVersion is the version number of the Portainer API.
-	APIVersion = "1.13.5"
+	APIVersion = "1.13.6"
 	// DBVersion is the version number of the Portainer database.
 	DBVersion = 2
 	// DefaultTemplatesURL represents the default URL for the templates definitions.

app/rest/docker/system.js

@@ -1,7 +1,7 @@
 angular.module('portainer.rest')
 .factory('System', ['$resource', 'DOCKER_ENDPOINT', 'EndpointProvider', function SystemFactory($resource, DOCKER_ENDPOINT, EndpointProvider) {
   'use strict';
-  return $resource(DOCKER_ENDPOINT + '/:endpointId/:action', {
+  return $resource(DOCKER_ENDPOINT + '/:endpointId/:action/:subAction', {
     name: '@name',
     endpointId: EndpointProvider.endpointID
   },
@@ -13,6 +13,6 @@ angular.module('portainer.rest')
       isArray: true, transformResponse: jsonObjectsToArrayHandler
     },
     auth: { method: 'POST', params: { action: 'auth' } },
-    dataUsage: { method: 'GET', params: { action: 'system/df' } }
+    dataUsage: { method: 'GET', params: { action: 'system', subAction: 'df' } }
   });
 }]);

bower.json

@@ -1,6 +1,6 @@
 {
   "name": "portainer",
-  "version": "1.13.5",
+  "version": "1.13.6",
   "homepage": "https://github.com/portainer/portainer",
   "authors": [
     "Anthony Lapenna <anthony.lapenna at gmail dot com>"

package.json

@@ -2,7 +2,7 @@
   "author": "Portainer.io",
   "name": "portainer",
   "homepage": "http://portainer.io",
-  "version": "1.13.5",
+  "version": "1.13.6",
   "repository": {
     "type": "git",
     "url": "git@github.com:portainer/portainer.git"