From a09ba183b1591cb69979f2ed99ecb468ef20b4d0 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?R=C3=A9mi=20-=20Le=20Filament?= <remi@le-filament.com>
Date: Tue, 28 Mar 2023 15:47:17 +0200
Subject: [PATCH] [UPD] merged web_no_bubble
---
16.0-scratch.Dockerfile | 2 +-
16.0.Dockerfile | 6 +-----
2 files changed, 2 insertions(+), 6 deletions(-)
diff --git a/16.0-scratch.Dockerfile b/16.0-scratch.Dockerfile
index 969c23d..13ee936 100644
--- a/16.0-scratch.Dockerfile
+++ b/16.0-scratch.Dockerfile
@@ -134,7 +134,7 @@ RUN mkdir -p \
&& mv /tmp/oca-repos/web/web_chatter_position \
/tmp/oca-repos/web/web_environment_ribbon \
/tmp/oca-repos/web/web_responsive \
-# /tmp/oca-repos/web/web_no_bubble \
+ /tmp/oca-repos/web/web_no_bubble \
/tmp/oca-repos/web/web_refresher \
/tmp/oca-repos/web/web_theme_classic \
/newroot/opt/odoo/additional_addons/ \
diff --git a/16.0.Dockerfile b/16.0.Dockerfile
index 0578177..5487b85 100644
--- a/16.0.Dockerfile
+++ b/16.0.Dockerfile
@@ -118,16 +118,12 @@ RUN set -x; \
mv /tmp/oca-repos/social/mail_debrand \
# /tmp/oca-repos/social/mail_tracking \ # https://github.com/OCA/social/pull/1091
/opt/odoo/additional_addons/ &&\
- # Until migrated to OCA (https://github.com/OCA/web/pull/2462)
- git clone -b 16_mig_web_no_bubble --depth 1 https://github.com/onesteinbv/web.git /tmp/oca-repos/web-onestein &&\
- mv /tmp/oca-repos/web-onestein/web_no_bubble \
- /opt/odoo/additional_addons/ &&\
git clone -b 16.0 --depth 1 https://github.com/OCA/web.git /tmp/oca-repos/web &&\
mv /tmp/oca-repos/web/web_chatter_position \
/tmp/oca-repos/web/web_environment_ribbon \
/tmp/oca-repos/web/web_refresher \
/tmp/oca-repos/web/web_responsive \
-# /tmp/oca-repos/web/web_no_bubble \ # https://github.com/OCA/social/pull/2462
+ /tmp/oca-repos/web/web_no_bubble \
/tmp/oca-repos/web/web_theme_classic \
/opt/odoo/additional_addons/ &&\
rm -rf /tmp/oca-repos/ &&\
--
GitLab