diff options
| author | Mario <mario@mariovavti.com> | 2024-03-16 12:18:46 +0000 |
|---|---|---|
| committer | Mario <mario@mariovavti.com> | 2024-03-16 12:18:46 +0000 |
| commit | 36778850eefa70106c78348c58a8d05d20aa7094 (patch) | |
| tree | 808a4ebbc9a93fce7cdca8a9761a75ac762fc0ea | |
| parent | 24132e56d9dd738ac64ab66a9d93b68a945787d7 (diff) | |
| parent | 19c0e976589eba89bbde51482cd50e3a91edea95 (diff) | |
| download | volse-hubzilla-36778850eefa70106c78348c58a8d05d20aa7094.tar.gz volse-hubzilla-36778850eefa70106c78348c58a8d05d20aa7094.tar.bz2 volse-hubzilla-36778850eefa70106c78348c58a8d05d20aa7094.zip | |
Merge branch 'dev' into 9.0RC
| -rw-r--r-- | .gitlab-ci.yml | 2 | ||||
| -rw-r--r-- | composer.json | 8 | ||||
| -rw-r--r-- | composer.lock | 2 | ||||
| -rw-r--r-- | vendor/composer/installed.php | 12 |
4 files changed, 9 insertions, 15 deletions
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 76dc41334..3273d383b 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -29,7 +29,7 @@ variables: before_script: # Install & enable Xdebug for code coverage reports - apt-get update - - apt-get install -yqq libicu-dev libjpeg-dev libpng-dev libpq-dev libyaml-dev libzip-dev mariadb-client postgresql-client unzip zip + - apt-get install -yqq libicu-dev libjpeg-dev libpng-dev libpq-dev libyaml-dev libzip-dev mariadb-client postgresql-client unzip zip git - pecl install xdebug yaml - docker-php-ext-enable xdebug yaml - docker-php-ext-install gd bcmath intl pdo_mysql pdo_pgsql zip diff --git a/composer.json b/composer.json index e375b8a32..d8a13fdf3 100644 --- a/composer.json +++ b/composer.json @@ -81,11 +81,5 @@ "config": { "notify-on-install": false, "optimize-autoloader": true - }, - "repositories": [ - { - "type": "vcs", - "url": "https://github.com/simplepie/simplepie" - } - ] + } } diff --git a/composer.lock b/composer.lock index 584f08551..63d5a963c 100644 --- a/composer.lock +++ b/composer.lock @@ -4,7 +4,7 @@ "Read more about it at https://getcomposer.org/doc/01-basic-usage.md#installing-dependencies", "This file is @generated automatically" ], - "content-hash": "238129164013c0705a6a97f8c3ba617b", + "content-hash": "3a17d1b44bc28f3609d086af7b358f72", "packages": [ { "name": "blueimp/jquery-file-upload", diff --git a/vendor/composer/installed.php b/vendor/composer/installed.php index 8925761d5..17113d857 100644 --- a/vendor/composer/installed.php +++ b/vendor/composer/installed.php @@ -1,9 +1,9 @@ <?php return array( 'root' => array( 'name' => 'zotlabs/hubzilla', - 'pretty_version' => 'dev-master', - 'version' => 'dev-master', - 'reference' => 'a9d4adaf2360f7d02dace4434e4e62d6ce072327', + 'pretty_version' => 'dev-9.0RC', + 'version' => 'dev-9.0RC', + 'reference' => 'fe018d646a4f25d3512059f6e8d520441e95967c', 'type' => 'application', 'install_path' => __DIR__ . '/../../', 'aliases' => array(), @@ -338,9 +338,9 @@ 'dev_requirement' => false, ), 'zotlabs/hubzilla' => array( - 'pretty_version' => 'dev-master', - 'version' => 'dev-master', - 'reference' => 'a9d4adaf2360f7d02dace4434e4e62d6ce072327', + 'pretty_version' => 'dev-9.0RC', + 'version' => 'dev-9.0RC', + 'reference' => 'fe018d646a4f25d3512059f6e8d520441e95967c', 'type' => 'application', 'install_path' => __DIR__ . '/../../', 'aliases' => array(), |