resolve conflicts

2021-09-23 10:23:45 +12:00
parent b090143ef1 cbeb13636c
commit bda164fca4
51 changed files with 1666 additions and 1471 deletions
--- a/app/portainer/views/stacks/create/createStackController.js
+++ b/app/portainer/views/stacks/create/createStackController.js
@@ -34,7 +34,7 @@ angular
      StackFile: null,
      RepositoryURL: '',
      RepositoryReferenceName: '',
-      RepositoryAuthentication: true,
+      RepositoryAuthentication: false,
      RepositoryUsername: '',
      RepositoryPassword: '',
      Env: [],