Solve git conflicts

# SPDX-FileCopyrightText: 2016-2024 Nextcloud GmbH and Nextcloud contributors

# SPDX-License-Identifier: MIT

codecov:

  branch: master

  ci:

type: docker

name: test-master

# SPDX-FileCopyrightText: 2016-2024 Nextcloud GmbH and Nextcloud contributors

# SPDX-License-Identifier: MIT

steps:

- name: test

  image: ghcr.io/nextcloud/continuous-integration-android8:3

    image: ghcr.io/nextcloud/continuous-integration-shallow-server:latest

    commands:

      - apt-get update && apt-get install -y composer

      - mkdir /var/www/.nvm /var/www/.npm; touch /var/www/.bashrc; chown -R 33:33 /var/www/.nvm /var/www/.npm /var/www/.bashrc

      - su www-data -c "curl -o- https://raw.githubusercontent.com/nvm-sh/nvm/v0.37.2/install.sh | bash"

      - su www-data -c "source ~/.bashrc; nvm install node"

      - /usr/local/bin/initnc.sh

      - su www-data -c "php /var/www/html/occ log:manage --level warning"

      - su www-data -c "OC_PASS=user1 php /var/www/html/occ user:add --password-from-env --display-name='User One' user1"

      - su www-data -c "git clone https://github.com/nextcloud/photos.git /var/www/html/apps/photos/"

      - su www-data -c "cd /var/www/html/apps/photos; composer install"

      - su www-data -c "php /var/www/html/occ app:enable -f photos"

      - su www-data -c "git clone https://github.com/nextcloud/assistant.git /var/www/html/apps/assistant/"

      - su www-data -c "cd /var/www/html/apps/assistant; source ~/.bashrc; make"

      - su www-data -c "php /var/www/html/occ app:enable -f assistant"

      - su www-data -c "php /var/www/html/occ app:enable -f testing"

      - /usr/local/bin/run.sh

trigger:

    environment:

      SERVER_VERSION: stable27

    commands:

      - apt-get update && apt-get install -y composer

      - mkdir /var/www/.nvm /var/www/.npm; touch /var/www/.bashrc; chown -R 33:33 /var/www/.nvm /var/www/.npm /var/www/.bashrc

      - su www-data -c "curl -o- https://raw.githubusercontent.com/nvm-sh/nvm/v0.37.2/install.sh | bash"

      - su www-data -c "source ~/.bashrc; nvm install node"

      - BRANCH="$SERVER_VERSION" /usr/local/bin/initnc.sh

      - su www-data -c "php /var/www/html/occ log:manage --level warning"

      - su www-data -c "OC_PASS=user1 php /var/www/html/occ user:add --password-from-env --display-name='User One' user1"

      - su www-data -c "git clone -b $SERVER_VERSION https://github.com/nextcloud/notifications.git /var/www/html/apps/notifications/"

      - su www-data -c "php /var/www/html/occ app:enable -f notifications"

      - su www-data -c "php /var/www/html/occ notification:generate test test"

      - su www-data -c "git clone https://github.com/nextcloud/assistant.git /var/www/html/apps/assistant/"

      - su www-data -c "cd /var/www/html/apps/assistant; git checkout tags/v1.0.2; source ~/.bashrc; make"

      - su www-data -c "php /var/www/html/occ app:enable -f assistant"

      - su www-data -c "php /var/www/html/occ app:enable -f testing"

      - /usr/local/bin/run.sh

trigger:

    - pull_request

---

kind: signature

hmac: 677c48aafe0e8504e811ece2f1c7e0bd8a9fba2e319ca71770a28a3af1af1529

...

hmac: 11f8c4f828dbe5fd7faac061e6678a9c6b9fedac0601a1ac3b753102381d3918

# .editorconfig

# see http://EditorConfig.org

# SPDX-FileCopyrightText: 2016-2024 Nextcloud GmbH and Nextcloud contributors

# SPDX-License-Identifier: MIT

# This is the file in the root of the project.

# For sub folders you can have other files that override only some settings.

# For these, this settings should be false.

root=true

[*]

max_line_length=120

# use spaces, not tabs.

indent_style=space

indent_size=4

[*.yml]

max_line_length=150

charset=utf-8

# Trimming is good for consistency

trim_trailing_whitespace=true

# I've seen cases where a missing new_line was ignored on *nix systems.

# Never again with this setting!

insert_final_newline=true

[*.properties]

# Exception for Java properties files should be encoded latin1 (aka iso8859-1)

charset=latin1

[*.{cmd,bat}]

# batch files on Windows should stay with CRLF

end_of_line=crlf

[*.md]

trim_trailing_whitespace=false

[*.{kt,kts}]

# IDE does not follow this Ktlint rule strictly, but the default ordering is pretty good anyway, so let's ditch it

ktlint_standard_import-ordering = disabled

ij_kotlin_allow_trailing_comma = false

ij_kotlin_allow_trailing_comma_on_call_site = false

# synced from @nextcloud/android-config

version: 2

updates:

    -   package-ecosystem: "github-actions"

        directory: "/"

        schedule:

            interval: "weekly"

    -   package-ecosystem: gradle

        directory: "/"

        schedule:

            interval: daily

            time: "03:00"

            timezone: Europe/Paris

        rebase-strategy: "disabled"

        open-pull-requests-limit: 10

        labels:

            - 3. to review

            - dependencies

# synced from @nextcloud/android-config

# SPDX-FileCopyrightText: 2023-2024 Nextcloud GmbH and Nextcloud contributors

# SPDX-FileCopyrightText: 2023 Tobias Kaminsky <tobias@kaminsky.me>

# SPDX-FileCopyrightText: 2023 Andy Scherzinger <info@andy-scherzinger.de>

# SPDX-FileCopyrightText: 2023 Josh Richards <josh.t.richards@gmail.com>

# SPDX-License-Identifier: GPL-3.0-or-later

name: "Analysis"

on: