Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit af0a0cfd authored by AVINASH GUSAIN's avatar AVINASH GUSAIN
Browse files

Merge branch 'dev/5-5-11' into 'murena-main' 

Upgrade to 5.5.11

See merge request !69
parents 7f8c83f7 14d94415

.editorconfig

+1 −1
Original line number Diff line number Diff line
@@ -8,7 +8,7 @@ charset = utf-8 
end_of_line = lf

insert_final_newline = true



[*.{js,php,vue,scss}]

[*.{js,ts,php,vue,scss}]

indent_style = tab

insert_final_newline = true

.eslintrc.js

+11 −0
Original line number Diff line number Diff line
@@ -6,4 +6,15 @@ module.exports = { 
	extends: [

		'@nextcloud',

	],

	overrides: [

		{

			files: ['**/*.ts', '**/*.tsx'],

			extends: [

				'@nextcloud',

				'@nextcloud/eslint-config/typescript',

			],

			parser: '@typescript-eslint/parser',

			plugins: ['@typescript-eslint'],

		},

	],

}

.git-blame-ignore-revs

+3 −0
Original line number Diff line number Diff line
@@ -8,3 +8,6 @@ 


# Update to coding-standard 1.3.1

db4964b631856f514bc08d3da0e86014a18d678f



# Update to coding-standard 1.4.0

b80042c652fd7283482b732374878351ce66c2a5

.github/CODEOWNERS

+1 −1
Original line number Diff line number Diff line
@@ -2,4 +2,4 @@ 
# SPDX-License-Identifier: AGPL-3.0-or-later



# App maintainers

* @SebastianKrupinski @st3iny @tcitworld
 
* @SebastianKrupinski @GVodyanov @tcitworld

.github/workflows/block-unconventional-commits.yml

0 → 100644
+41 −0
Original line number Diff line number Diff line 
# This workflow is provided via the organization template repository

#

# https://github.com/nextcloud/.github

# https://docs.github.com/en/actions/learn-github-actions/sharing-workflows-with-your-organization

#

# SPDX-FileCopyrightText: 2024 Nextcloud GmbH and Nextcloud contributors

# SPDX-License-Identifier: MIT



name: Block unconventional commits



on:

  pull_request:

    types: [opened, ready_for_review, reopened, synchronize]



permissions:

  contents: read



concurrency:

  group: block-unconventional-commits-${{ github.head_ref || github.run_id }}

  cancel-in-progress: true



jobs:

  block-unconventional-commits:

    name: Block unconventional commits



    runs-on: ubuntu-latest-low



    steps:

      - name: Checkout

        uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2



      - uses: webiny/action-conventional-commits@8bc41ff4e7d423d56fa4905f6ff79209a78776c7 # v1.3.0

        if: ${{ github.base_ref == 'main' }}

        with:

          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}



      - uses: webiny/action-conventional-commits@8bc41ff4e7d423d56fa4905f6ff79209a78776c7 # v1.3.0

        if: ${{ github.base_ref != 'main' }}

        with:

          allowed-commit-types: "fix,docs,style,refactor,test,build,perf,ci,chore,revert,merge" # Anything but "feat" https://github.com/webiny/action-conventional-commits/blob/8bc41ff4e7d423d56fa4905f6ff79209a78776c7/action.yml#L9C15-L9C85

          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
 
 No newline at end of file