Solve conflics

CHANGELOG.md

@@ -7,6 +7,11 @@
 ### Improved
 - Se ha completado la opcion de inicion de sesion y eliminar imagen cache.
 
+---
+## [0.13.1] - 2025-05-23
+### Changed
+-  Desactivado temporalmente la funcionalidad de ogGit.
+
 ---
 ## [0.13.0] - 2025-05-20
 ### Added

ogWebconsole/src/app/components/groups/components/client-main-view/create-image/create-image.component.html

@@ -18,7 +18,9 @@
       <mat-label>Tipo de imagen</mat-label>
       <mat-select [(ngModel)]="imageType" class="full-width" (selectionChange)="onImageTypeSelected($event.value)">
         <mat-option [value]="'monolithic'">Monolítica</mat-option>
+        <!--
         <mat-option [value]="'git'">Git</mat-option>
+        -->
       </mat-select>
     </mat-form-field>
   </div>

ogWebconsole/src/app/components/groups/components/client-main-view/deploy-image/deploy-image.component.html

@@ -87,7 +87,9 @@
       <mat-label>Tipo de imagen</mat-label>
       <mat-select [(ngModel)]="imageType" (selectionChange)="onImageTypeSelected($event.value)">
         <mat-option [value]="'monolithic'">Monolítica</mat-option>
+        <!--
         <mat-option [value]="'git'">Git</mat-option>
+        -->
       </mat-select>
     </mat-form-field>
   </div>

ogWebconsole/src/app/components/repositories/repositories.component.html

@@ -51,6 +51,7 @@
           (click)="openShowMonoliticImagesDialog(repository)">
           {{ 'monolithicImage' | translate }}
         </button>
+        <!--
         <button
           class="action-button"
           joyrideStep="gitImageStep"
@@ -59,7 +60,8 @@
           [disabled]="!isGitModuleInstalled"
           (click)="openShowGitImagesDialog(repository)">
           {{ 'gitImage' | translate }}
-        </button>
+        </button
+        -->
       </ng-container>
     </td>
   </ng-container>