Skip to content

Commit

Permalink
Merge branch 'main' into Add-border-to-non-federated-notifications-fo…
Browse files Browse the repository at this point in the history
…r-admins-and-moderators
  • Loading branch information
melroy89 authored Dec 22, 2024
2 parents e5e319d + 77376e0 commit adc3ea2
Show file tree
Hide file tree
Showing 332 changed files with 2,194 additions and 5,539 deletions.
Empty file added .env.dev
Empty file.
2 changes: 0 additions & 2 deletions .github/workflows/action.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -34,13 +34,11 @@ jobs:
with:
path: ${{ steps.npm-cache-dir-path.outputs.dir }}
key: ${{ runner.os }}-npm-${{ hashFiles('**/package-lock.json') }}
restore-keys: ${{ runner.os }}-npm-

- uses: actions/cache@v4
with:
path: ${{ steps.composer-cache.outputs.dir }}
key: ${{ runner.os }}-composer-no-dev-${{ hashFiles('**/composer.lock') }}
restore-keys: ${{ runner.os }}-composer-no-dev-

- run: cp .env.example .env
- name: Composer install
Expand Down
2 changes: 1 addition & 1 deletion ci/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ RUN curl -sSLf \
https://github.com/mlocati/docker-php-extension-installer/releases/latest/download/install-php-extensions
RUN chmod +x /usr/local/bin/install-php-extensions

RUN install-php-extensions amqp intl redis gd zip bcmath xsl
RUN install-php-extensions amqp intl redis gd zip bcmath xsl pdo_pgsql

# Unlimited memory
RUN echo "memory_limit = -1" >>/usr/local/etc/php/conf.d/docker-php-memlimit.ini
8 changes: 4 additions & 4 deletions composer.json
Original file line number Diff line number Diff line change
Expand Up @@ -64,12 +64,12 @@
"scheb/2fa-totp": "^7.5.0",
"scienta/doctrine-json-functions": "^6.1.0",
"stevenmaguire/oauth2-keycloak": "^5.1.0",
"symfony/amqp-messenger": "7.1.*",
"symfony/amqp-messenger": "7.2.*",
"symfony/asset": "7.1.*",
"symfony/cache": "7.2.*",
"symfony/console": "7.1.*",
"symfony/css-selector": "7.1.*",
"symfony/doctrine-messenger": "7.1.*",
"symfony/doctrine-messenger": "7.2.*",
"symfony/dotenv": "7.1.*",
"symfony/expression-language": "7.2.*",
"symfony/flex": "^2.4.5",
Expand All @@ -90,7 +90,7 @@
"symfony/runtime": "7.1.*",
"symfony/scheduler": "7.1.*",
"symfony/security-bundle": "7.2.*",
"symfony/security-csrf": "7.1.*",
"symfony/security-csrf": "7.2.*",
"symfony/serializer": "7.1.*",
"symfony/string": "7.1.*",
"symfony/translation": "7.1.*",
Expand All @@ -103,7 +103,7 @@
"symfony/validator": "7.1.*",
"symfony/webpack-encore-bundle": "^2.1.1",
"symfony/workflow": "7.1.*",
"symfony/yaml": "7.1.*",
"symfony/yaml": "7.2.*",
"symfonycasts/reset-password-bundle": "^1.22.0",
"symfonycasts/verify-email-bundle": "^1.17.0",
"thenetworg/oauth2-azure": "^2.2.2",
Expand Down
Loading

0 comments on commit adc3ea2

Please sign in to comment.