diff --git a/Dockerfile b/Dockerfile index bdcdaeb..a5dc2e5 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,37 +1,37 @@ -FROM mozilla/mozphab:93c7f2bac9908b9e9b02c1c389517fe4e420c93a +FROM mozilla/mozphab:1c2f32b296344f2b32263421efb6d4a2ab3635f2 COPY extensions /app/moz-extensions # Move static resources to phabricator, add files to celerity map array COPY extensions/src/auth/PhabricatorBMOAuth.css /app/phabricator/webroot/rsrc/css/PhabricatorBMOAuth.css COPY extensions/src/auth/PhabricatorBMOAuth.js /app/phabricator/webroot/rsrc/js/PhabricatorBMOAuth.js USER root # Install dependencies ENV COMPOSER_ALLOW_SUPERUSER 1 ENV COMPOSER_VENDOR_DIR /app/phabricator/externals/extensions RUN \ curl -sS https://getcomposer.org/installer | php && \ php composer.phar require --no-plugins --no-scripts "sentry/sentry" # Apply customization patches COPY patches /app/patches RUN \ cd /app/phabricator && \ for i in /app/patches/phabricator/*.patch; do patch -p1 < $i; done # Configure Phabricator to use moz-extensions library RUN \ mkdir /app/phabricator/conf/custom/ && \ echo custom/moz-extensions > /app/phabricator/conf/local/ENVIRONMENT COPY moz-extensions.conf.php /app/phabricator/conf/custom/ # Update build_url in version.json COPY phabext.json /app COPY update_build_url.py /app RUN /app/update_build_url.py RUN chown -R app:app /app USER app VOLUME ["/app"] diff --git a/patches/phabricator/1446973_1.patch b/patches/phabricator/1446973_1.patch index b3c7767..b3cf7d3 100644 --- a/patches/phabricator/1446973_1.patch +++ b/patches/phabricator/1446973_1.patch @@ -1,23 +1,24 @@ diff --git a/src/applications/differential/controller/DifferentialRevisionViewController.php b/src/applications/differential/controller/DifferentialRevisionViewController.php -index d7280cb0b..f6e388a5f 100644 +old mode 100644 +new mode 100755 +index 6b13e89..05ebd30 --- a/src/applications/differential/controller/DifferentialRevisionViewController.php +++ b/src/applications/differential/controller/DifferentialRevisionViewController.php -@@ -142,6 +142,10 @@ final class DifferentialRevisionViewController extends DifferentialController { +@@ -172,6 +172,9 @@ final class DifferentialRevisionViewController + + $request_uri = $request->getRequestURI(); - $limit = 100; - $large = $request->getStr('large'); -+ + $moz_warnings = new DifferentialRevisionWarning(); + $moz_warnings = $moz_warnings->createWarnings($viewer, $revision); + - if (count($changesets) > $limit && !$large) { - $count = count($changesets); - $warning = new PHUIInfoView(); -@@ -493,6 +497,7 @@ final class DifferentialRevisionViewController extends DifferentialController { + $large = $request->getStr('large'); + + $large_warning = +@@ -584,6 +587,7 @@ final class DifferentialRevisionViewController ->setMainColumn( array( $operations_box, + $moz_warnings, $info_view, $details, $diff_detail_box,