fix(ui): Stop using the deprecated url format for gitlab instances (a…

…rgoproj#13687) * fix: Stop using the deprecated url format for gitlab instances The legacy URLs format has been deprecated since february 2023 and now gitlab is make these urls invalid. Ref: https://docs.gitlab.com/ee/update/deprecations.html#legacy-urls-replaced-or-removed Signed-off-by: Miguel Sacristán Izcue <miguel_tete17@hotmail.com> * docs: Add Urbantz to the list of organizations using argo-cd Signed-off-by: Miguel Sacristán Izcue <miguel_tete17@hotmail.com> --------- Signed-off-by: Miguel Sacristán Izcue <miguel_tete17@hotmail.com> (cherry picked from commit 5662367) Signed-off-by: Miguel Sacristán Izcue <miguel_tete17@hotmail.com>
tete17 · May 28, 2023 · 358db7b · 358db7b
1 parent 5640b72
commit 358db7b
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 1 deletion.
diff --git a/USERS.md b/USERS.md
@@ -222,6 +222,7 @@ Currently, the following organizations are **officially** using Argo CD:
 1. [ungleich.ch](https://ungleich.ch/)
 1. [Unifonic Inc](https://www.unifonic.com/)
 1. [Universidad Mesoamericana](https://www.umes.edu.gt/)
+1. [Urbantz](https://urbantz.com/)
 1. [Viaduct](https://www.viaduct.ai/)
 1. [Virtuo](https://www.govirtuo.com/)
 1. [VISITS Technologies](https://visits.world/en)

diff --git a/ui/src/app/shared/components/urls.test.ts b/ui/src/app/shared/components/urls.test.ts
@@ -35,7 +35,7 @@ test('gitlab.com', () => {
         'git@gitlab.com:alex_collins/private-repo.git',
         'b1fe9426ead684d7af16958920968342ee295c1f',
         'https://gitlab.com/alex_collins/private-repo',
-        'https://gitlab.com/alex_collins/private-repo/commit/b1fe9426ead684d7af16958920968342ee295c1f');
+        'https://gitlab.com/alex_collins/private-repo/-/commit/b1fe9426ead684d7af16958920968342ee295c1f');
 });
 
 test('bitbucket.org', () => {

diff --git a/ui/src/app/shared/components/urls.ts b/ui/src/app/shared/components/urls.ts
@@ -33,6 +33,12 @@ export function revisionUrl(url: string, revision: string): string {
         urlSubPath = isSHA(revision) ? 'commits' : 'src';
     }
 
+    // Gitlab changed the way urls to commit look like
+    // Ref: https://docs.gitlab.com/ee/update/deprecations.html#legacy-urls-replaced-or-removed
+    if (parsed.source === 'gitlab.com') {
+        urlSubPath = '-/' + urlSubPath;
+    }
+
     if (!supportedSource(parsed)) {
         return null;
     }