Removing cypress/fixtures/swh:1:rev:1c480a4573d2a003fc2630c21c2b25829de49972.gitfast.gz
Merge made by the 'recursive' strategy.
 assets/src/bundles/vault/vault-create-tasks.js     |   8 ++---
 assets/src/bundles/vault/vault-table-row.ejs       |  13 +++----
 assets/src/bundles/vault/vault-ui.js               |   8 ++---
 ...0a4573d2a003fc2630c21c2b25829de49972.gitfast.gz | Bin 1391 -> 0 bytes
 ...d19126d815470b28919d64b2a8e6a3e37f900dd.tar.gz} | Bin
 ...c480a4573d2a003fc2630c21c2b25829de49972.git.tar | Bin 0 -> 20480 bytes
 cypress/integration/vault.spec.js                  |  38 +++++++++++++--------
 swh/web/api/views/vault.py                         |  20 +++++++----
 swh/web/common/utils.py                            |   6 ++++
 swh/web/templates/browse/vault-ui.html             |   2 +-
 swh/web/templates/includes/vault-create-tasks.html |   4 +--
 11 files changed, 60 insertions(+), 39 deletions(-)
 delete mode 100644 cypress/fixtures/swh:1:rev:1c480a4573d2a003fc2630c21c2b25829de49972.gitfast.gz
 rename cypress/fixtures/{swh:1:dir:cd19126d815470b28919d64b2a8e6a3e37f900dd.tar.gz => swh_1_dir_cd19126d815470b28919d64b2a8e6a3e37f900dd.tar.gz} (100%)
 create mode 100644 cypress/fixtures/swh_1_rev_1c480a4573d2a003fc2630c21c2b25829de49972.git.tar

Changes applied before test

commit e4bc4d186a2726d81713b5319a3b86c8ab9ba9a5
Merge: d0335365 f4c2861b
Author: Jenkins user <jenkins@localhost>
Date:   Thu Sep 2 15:49:23 2021 +0000

    Merge branch 'diff-target' into HEAD

commit f4c2861ba1db6c67252cabbea7708c0631df96b3
Author: Valentin Lorentz <vlorentz@softwareheritage.org>
Date:   Thu Sep 2 17:48:44 2021 +0200

    vault-ui: Remove remaining references to object_type

commit 42c74df4882106090573433e235fa8eccd260b94
Author: Valentin Lorentz <vlorentz@softwareheritage.org>
Date:   Thu Sep 2 16:58:06 2021 +0200

    vault: Rename downloaded files to replace ':' with '_' in SWHIDs
    
    Both Firefox and Chromium replace ':' (with spaces and underscores respectively)

commit 7e1e167e80273f90a48d991e6e63102acaec28fd
Author: Valentin Lorentz <vlorentz@softwareheritage.org>
Date:   Thu Sep 2 15:06:31 2021 +0200

    Switch the UI to use bare git archives, instead of gitfast.

See https://jenkins.softwareheritage.org/job/DWAPPS/job/tests-on-diff/1061/ for more details.

Harbormaster completed remote builds in B23329: Diff 22374.Sep 2 2021, 6:05 PM

vlorentz requested review of this revision.Sep 2 2021, 6:05 PM

anlambert accepted this revision.Sep 2 2021, 6:52 PM

This revision is now accepted and ready to land.Sep 2 2021, 6:52 PM

vlorentz mentioned this in D6171: Switch the UI to use bare git archives, instead of gitfast..Sep 2 2021, 7:29 PM

rebase

Build is green

Patch application report for D6175 (id=22383)

Could not rebase; Attempt merge onto d0335365a4...

Updating d0335365..af07239d
Fast-forward
 assets/src/bundles/vault/vault-create-tasks.js     |   8 ++---
 assets/src/bundles/vault/vault-table-row.ejs       |  13 +++----
 assets/src/bundles/vault/vault-ui.js               |   8 ++---
 ...0a4573d2a003fc2630c21c2b25829de49972.gitfast.gz | Bin 1391 -> 0 bytes
 ...d19126d815470b28919d64b2a8e6a3e37f900dd.tar.gz} | Bin
 ...c480a4573d2a003fc2630c21c2b25829de49972.git.tar | Bin 0 -> 20480 bytes
 cypress/integration/vault.spec.js                  |  38 +++++++++++++--------
 swh/web/api/views/vault.py                         |  20 +++++++----
 swh/web/common/utils.py                            |   6 ++++
 swh/web/templates/browse/vault-ui.html             |   2 +-
 swh/web/templates/includes/vault-create-tasks.html |   4 +--
 11 files changed, 60 insertions(+), 39 deletions(-)
 delete mode 100644 cypress/fixtures/swh:1:rev:1c480a4573d2a003fc2630c21c2b25829de49972.gitfast.gz
 rename cypress/fixtures/{swh:1:dir:cd19126d815470b28919d64b2a8e6a3e37f900dd.tar.gz => swh_1_dir_cd19126d815470b28919d64b2a8e6a3e37f900dd.tar.gz} (100%)
 create mode 100644 cypress/fixtures/swh_1_rev_1c480a4573d2a003fc2630c21c2b25829de49972.git.tar

Changes applied before test

commit af07239d95cf2718a105b754fc7dbe847c9406bf
Author: Valentin Lorentz <vlorentz@softwareheritage.org>
Date:   Thu Sep 2 17:48:44 2021 +0200

    vault-ui: Remove remaining references to object_type

commit 23d3d68f19686a83eb3a89a65465e12b487a0f8d
Author: Valentin Lorentz <vlorentz@softwareheritage.org>
Date:   Thu Sep 2 16:58:06 2021 +0200

    vault: Rename downloaded files to replace ':' with '_' in SWHIDs
    
    Both Firefox and Chromium replace ':' (with spaces and underscores respectively)

commit f324ac3a549c4cf4bd78210eeca57e639dfcf668
Author: Valentin Lorentz <vlorentz@softwareheritage.org>
Date:   Thu Sep 2 15:06:31 2021 +0200

    Switch the UI to use bare git archives, instead of gitfast.

See https://jenkins.softwareheritage.org/job/DWAPPS/job/tests-on-diff/1064/ for more details.

Harbormaster completed remote builds in B23337: Diff 22383.Sep 3 2021, 1:43 PM

Closed by commit rDWAPPSaf07239d95cf: vault-ui: Remove remaining references to object_type (authored by vlorentz). · Explain WhySep 3 2021, 1:43 PM

This revision was automatically updated to reflect the committed changes.

vlorentz added a commit: rDWAPPSaf07239d95cf: vault-ui: Remove remaining references to object_type.