Revert "fix(gitops): correct commit hash link [EE-6346] (#10722 )" (#10788 )

This reverts commit 83cd5d9b2f.
fix(rollback): reversed rollback code from 2.19.4 [EE-6435] (#10787 )
2023-12-07 17:05:17 +13:00 · 2023-12-07 16:42:41 +13:00 · 2023-12-07 16:40:07 +13:00 · 2023-12-07 16:34:03 +13:00 · 2023-12-07 16:33:46 +13:00 · 2023-12-07 16:33:00 +13:00
7 changed files with 15 additions and 7 deletions
--- a/api/datastore/test_data/output_24_to_latest.json
+++ b/api/datastore/test_data/output_24_to_latest.json
@@ -944,6 +944,6 @@
    }
  ],
  "version": {
-    "VERSION": "{\"SchemaVersion\":\"2.19.2\",\"MigratorCount\":0,\"Edition\":1,\"InstanceID\":\"463d5c47-0ea5-4aca-85b1-405ceefee254\"}"
+    "VERSION": "{\"SchemaVersion\":\"2.19.4\",\"MigratorCount\":0,\"Edition\":1,\"InstanceID\":\"463d5c47-0ea5-4aca-85b1-405ceefee254\"}"
  }
 }
--- a/api/http/handler/auth/logout.go
+++ b/api/http/handler/auth/logout.go
@@ -17,7 +17,6 @@ import (
 // @success 204 "Success"
 // @failure 500 "Server error"
 // @router /auth/logout [post]
-
 func (handler *Handler) logout(w http.ResponseWriter, r *http.Request) *httperror.HandlerError {
 	tokenData := handler.bouncer.JWTAuthLookup(r)

--- a/api/http/handler/handler.go
+++ b/api/http/handler/handler.go
@@ -84,7 +84,7 @@ type Handler struct {
 }

 // @title PortainerCE API
-// @version 2.19.2
+// @version 2.19.4
 // @description.markdown api-description.md
 // @termsOfService

--- a/api/portainer.go
+++ b/api/portainer.go
@@ -1561,7 +1561,7 @@ type (

 const (
 	// APIVersion is the version number of the Portainer API
-	APIVersion = "2.19.2"
+	APIVersion = "2.19.4"
 	// Edition is what this edition of Portainer is called
 	Edition = PortainerCE
 	// ComposeSyntaxMaxVersion is a maximum supported version of the docker compose syntax
--- a/api/stacks/deployments/deploy.go
+++ b/api/stacks/deployments/deploy.go
@@ -171,6 +171,11 @@ func getUserRegistries(datastore dataservices.DataStore, user *portainer.User, e
 }

 func isEnvironmentOnline(endpoint *portainer.Endpoint) bool {
+	if endpoint.Type != portainer.AgentOnDockerEnvironment &&
+		endpoint.Type != portainer.AgentOnKubernetesEnvironment {
+		return true
+	}
+
 	var err error
 	var tlsConfig *tls.Config
 	if endpoint.TLSConfig.TLS {
--- a/app/docker/views/services/edit/serviceController.js
+++ b/app/docker/views/services/edit/serviceController.js
@@ -474,7 +474,7 @@ angular.module('portainer.docker').controller('ServiceController', [
        '';
      if (oldCredSpecId && !credSpecId) {
        delete config.TaskTemplate.ContainerSpec.Privileges.CredentialSpec;
-      } else if (oldCredSpecId !== credSpec) {
+      } else if (credSpec && oldCredSpecId !== credSpec) {
        config.TaskTemplate.ContainerSpec.Privileges = {
          ...(config.TaskTemplate.ContainerSpec.Privileges || {}),
          CredentialSpec: {
@@ -854,6 +854,10 @@ angular.module('portainer.docker').controller('ServiceController', [

    $scope.filterConfigs = filterConfigs;
    function filterConfigs(configs) {
+      if (!configs) {
+        return [];
+      }
+
      return configs.filter((config) => $scope.service.ServiceConfigs.every((serviceConfig) => config.Id !== serviceConfig.Id));
    }

--- a/package.json
+++ b/package.json
@@ -2,7 +2,7 @@
  "author": "Portainer.io",
  "name": "portainer",
  "homepage": "http://portainer.io",
-  "version": "2.19.2",
+  "version": "2.19.4",
  "repository": {
    "type": "git",
    "url": "git@github.com:portainer/portainer.git"
@@ -231,4 +231,4 @@
    "**/moment": "^2.21.0"
  },
  "browserslist": "last 2 versions"
-}
+}
Author	SHA1	Message	Date
Ali	90a160e83f	Revert "fix(gitops): correct commit hash link [EE-6346] (#10722 )" (#10788 ) This reverts commit `83cd5d9b2f`.	2023-12-07 17:05:17 +13:00
Matt Hook	f58aa8cd5b	fix(rollback): reversed rollback code from 2.19.4 [EE-6435] (#10787 ) * Revert "fix(rollback): reimplement rollback feature [EE-6367] (#10720)" This reverts commit `93124f75cf`. * Revert "fix(backups): fix rollback feature [EE-6367] (#10691) (#10703)" This reverts commit `0fce4c98a0`.	2023-12-07 16:42:41 +13:00
Ali	b9ff7b6f32	Revert "fix toast error (#10724 )" (#10786 ) This reverts commit `6d0aefd7bb`.	2023-12-07 16:40:07 +13:00
Prabhat Khera	5761342069	Revert "fix(kube): configmaps and secrets from envFrom in the app detail screen [EE-6282] (#10741 )" (#10785 ) This reverts commit `ce4b6dc586`.	2023-12-07 16:34:03 +13:00
Ali	d8480a0db6	Revert "fix(app): shift external to the top [EE-6392] (#10753 )" (#10784 ) This reverts commit `0f89ade048`.	2023-12-07 16:33:46 +13:00
Ali	03a4f1227e	Revert "fix(gitops): clean trailing slash [EE-6346] (#10778 )" (#10781 ) This reverts commit `e78519f492`.	2023-12-07 16:33:00 +13:00
Ali	ee6c3f958f	Revert "fix(app): update sliders when limits are known [EE-5933] (#10769 )" (#10782 ) This reverts commit `f80501b505`.	2023-12-07 16:32:46 +13:00
Ali	e78519f492	fix(gitops): clean trailing slash [EE-6346] (#10778 ) Co-authored-by: testa113 <testa113>	2023-12-07 13:43:05 +13:00
Ali	f80501b505	fix(app): update sliders when limits are known [EE-5933] (#10769 ) Co-authored-by: testa113 <testa113>	2023-12-07 12:36:50 +13:00
Ali	0f89ade048	fix(app): shift external to the top [EE-6392] (#10753 ) Co-authored-by: testa113 <testa113>	2023-12-07 12:11:19 +13:00
Matt Hook	6d0aefd7bb	fix toast error (#10724 )	2023-12-07 12:01:21 +13:00
Ali	6aa0a1ffa9	fix(gitops): correct commit hash link [EE-6346] (#10752 ) Co-authored-by: testa113 <testa113>	2023-12-06 16:31:24 +13:00
Prabhat Khera	ce4b6dc586	fix(kube): configmaps and secrets from envFrom in the app detail screen [EE-6282] (#10741 ) * fix configmaps and secrets from envFrom * adress review comments	2023-12-06 16:02:30 +13:00
Chaim Lev-Ari	4410394ede	Revert "fix(images): sort by tags [EE-6410]" (#10754 )	2023-12-05 05:28:55 +02:00
Ali	e5eb354d7b	Revert "fix(app): shift external to the top [EE-6392] (#10718 )" (#10749 ) This reverts commit `b051629f13`.	2023-12-05 09:16:40 +13:00
Ali	b660feafbf	Revert "fix(gitops): correct commit hash link [EE-6346] (#10722 )" (#10750 ) This reverts commit `83cd5d9b2f`.	2023-12-05 09:16:22 +13:00
Chaim Lev-Ari	b75f0e561b	fix(images): sort by tags [EE-6410] (#10739 )	2023-12-04 08:47:19 +02:00
Ali	83cd5d9b2f	fix(gitops): correct commit hash link [EE-6346] (#10722 )	2023-12-04 11:18:05 +13:00
Ali	b051629f13	fix(app): shift external to the top [EE-6392] (#10718 ) Co-authored-by: testa113 <testa113>	2023-12-04 07:43:50 +13:00
andres-portainer	32da62cdc8	feat(version): bump to v2.19.4 EE-6407 (#10730 )	2023-12-01 11:18:52 -03:00
Matt Hook	93124f75cf	fix(rollback): reimplement rollback feature [EE-6367] (#10720 )	2023-12-01 13:02:37 +13:00
Matt Hook	0fce4c98a0	fix(backups): fix rollback feature [EE-6367] (#10691 ) (#10703 )	2023-12-01 10:03:31 +13:00
Chaim Lev-Ari	5dad419f60	fix(swarm/services): avoid sending credSpec object when empty [EE-6322] (#10636 ) Co-authored-by: matias-portainer <104775949+matias-portainer@users.noreply.github.com>	2023-11-26 07:01:58 +02:00
andres-portainer	cd9ad97235	fix(gitops): change the condition that checks if the environment is online EE-6321 (#10664 )	2023-11-20 23:59:22 -03:00
Prabhat Khera	67308838fd	version bump to 2.19.3 (#10645 )	2023-11-17 09:51:21 +13:00
andres-portainer	3360576e07	fix(gitops): handle the local environment in isEnvironmentOnline() EE-6321 (#10632 )	2023-11-16 09:40:24 -03:00
yi-portainer	c5a51a9fb7	* remove line break	2023-11-13 14:17:00 +13:00