Skip to content

Commit

Permalink
Merge branch 'release/0.25-stable' of github.com:Platoniq/decidim int…
Browse files Browse the repository at this point in the history 
…o temp/0.25
  • Loading branch information
@fblupi
fblupi committed Feb 1, 2023
2 parents 8de1ef8 + 04ca5eb commit 27ce9f6
Show file tree
Hide file tree
Showing 3,966 changed files with 159,519 additions and 135,024 deletions.
The diff you're trying to view is too large. We only load the first 3000 changed files.
19 changes: 4 additions & 15 deletions .babelrc
View file
Original file line number Diff line number Diff line change
@@ -1,17 +1,6 @@
// This file is required by jest (otherwise, it doesn't transpile the test files)
{
"presets": [
"env",
"airbnb",
"react",
"stage-2"
],
"plugins": ["transform-decorators-legacy"],
"env": {
"test": {
"plugins": [
["__coverage__", {"ignore": "*.+(test|stub).*"}],
"transform-es2015-modules-commonjs"
]
}
}
"presets": [
"@babel/preset-env"
]
}
9 changes: 8 additions & 1 deletion .codeclimate.yml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -115,7 +115,14 @@ plugins:
severity: minor

stylelint:
enabled: true
# FIXME: after the webpacker packages changes, this is broken with this error:
#
# > Error: Could not find "@decidim/stylelint-config". Do you need a `configBasedir`?
# > See our documentation at https://docs.codeclimate.com/docs/stylelint for more information.
#
# Disabling it for the moment, we should enable it as it's useful.
#
enabled: false
exclude_patterns:
- "decidim-admin/app/assets/stylesheets/decidim/admin/bundle.scss"
- "decidim-core/app/assets/stylesheets/decidim/email.css"
Expand Down
2 changes: 1 addition & 1 deletion .decidim-version
View file
Original file line number Diff line number Diff line change
@@ -1 +1 @@
0.24.3
0.25.2
277 changes: 1 addition & 276 deletions .eslintrc.json
View file
Original file line number Diff line number Diff line change
@@ -1,278 +1,3 @@
{
"env": {
"browser": true,
"es6": true
},
"extends": ["eslint:recommended", "plugin:react/recommended"],
"parser": "babel-eslint",
"parserOptions": {
"ecmaFeatures": {
"experimentalObjectRestSpread": true,
"jsx": true
},
"sourceType": "module"
},
"plugins": [
"react"
],
"globals": {
"$": false,
"jQuery": false,
"React": false,
"ReactDOM": false,
"describe": false,
"it": false,
"expect": false,
"beforeEach": false,
"afterEach": false,
"sinon": false,
"GraphQLDocs": false,
"Quill": false,
"SVGInjector": false,
"require": false,
"DecidimAdmin": false,
"L": false,
"decidimBulletinBoard": false
},
"rules": {
"accessor-pairs": "error",
"array-bracket-spacing": "error",
"array-callback-return": "error",
"arrow-body-style": "off",
"arrow-parens": [
"error",
"always"
],
"arrow-spacing": [
"error",
{
"after": true,
"before": true
}
],
"block-scoped-var": "error",
"block-spacing": "off",
"callback-return": "error",
"camelcase": "error",
"class-methods-use-this": "off",
"comma-dangle": ["error", "never"],
"comma-spacing": [
"error",
{
"after": true,
"before": false
}
],
"comma-style": [
"error",
"last"
],
"complexity": "error",
"computed-property-spacing": [
"error",
"never"
],
"consistent-return": "error",
"consistent-this": "error",
"curly": "error",
"default-case": "error",
"dot-location": "error",
"dot-notation": "error",
"eol-last": "error",
"eqeqeq": "error",
"func-call-spacing": "error",
"func-name-matching": "error",
"func-names": [
"error",
"never"
],
"func-style": "error",
"generator-star-spacing": "error",
"global-require": "error",
"guard-for-in": "error",
"handle-callback-err": "error",
"id-blacklist": "error",
"id-length": "error",
"id-match": "error",
"indent": ["error", 2, { "VariableDeclarator": 2 }],
"init-declarations": "error",
"jsx-quotes": "error",
"key-spacing": "error",
"keyword-spacing": [
"error",
{
"after": true,
"before": true
}
],
"line-comment-position": "error",
"linebreak-style": [
"error",
"unix"
],
"lines-around-comment": "error",
"lines-around-directive": "error",
"max-depth": "error",
"max-len": "off",
"max-lines": "error",
"max-nested-callbacks": "error",
"max-params": "error",
"max-statements": "off",
"max-statements-per-line": "error",
"multiline-ternary": "error",
"new-cap": "error",
"new-parens": "error",
"newline-after-var": "off",
"newline-before-return": "off",
"newline-per-chained-call": "off",
"no-alert": "error",
"no-array-constructor": "error",
"no-bitwise": "error",
"no-caller": "error",
"no-catch-shadow": "error",
"no-confusing-arrow": "error",
"no-continue": "error",
"no-div-regex": "error",
"no-duplicate-imports": "error",
"no-else-return": "error",
"no-eq-null": "error",
"no-eval": "error",
"no-extend-native": "error",
"no-extra-bind": "error",
"no-extra-label": "error",
"no-extra-parens": "off",
"no-floating-decimal": "error",
"no-implicit-coercion": "error",
"no-implicit-globals": "error",
"no-implied-eval": "error",
"no-inline-comments": "error",
"no-invalid-this": "error",
"no-iterator": "error",
"no-label-var": "error",
"no-labels": "error",
"no-lone-blocks": "error",
"no-lonely-if": "error",
"no-loop-func": "error",
"no-magic-numbers": "off",
"no-mixed-operators": "error",
"no-mixed-requires": "error",
"no-multi-spaces": "off",
"no-multi-str": "error",
"no-multiple-empty-lines": "error",
"no-native-reassign": "error",
"no-negated-condition": "error",
"no-negated-in-lhs": "error",
"no-nested-ternary": "error",
"no-new": "error",
"no-new-func": "error",
"no-new-object": "error",
"no-new-require": "error",
"no-new-wrappers": "error",
"no-octal-escape": "error",
"no-param-reassign": "error",
"no-path-concat": "error",
"no-plusplus": "error",
"no-process-env": "error",
"no-process-exit": "error",
"no-proto": "error",
"no-prototype-builtins": "error",
"no-restricted-globals": "error",
"no-restricted-imports": "error",
"no-restricted-modules": "error",
"no-restricted-properties": "error",
"no-restricted-syntax": "error",
"no-return-assign": "error",
"no-script-url": "error",
"no-self-compare": "error",
"no-sequences": "error",
"no-shadow": "error",
"no-shadow-restricted-names": "error",
"no-spaced-func": "error",
"no-sync": "error",
"no-tabs": "error",
"no-template-curly-in-string": "error",
"no-ternary": "error",
"no-throw-literal": "error",
"no-trailing-spaces": "off",
"no-undef-init": "error",
"no-undefined": "error",
"no-underscore-dangle": "off",
"no-unmodified-loop-condition": "error",
"no-unneeded-ternary": "error",
"no-unused-expressions": "error",
"no-use-before-define": "error",
"no-useless-call": "error",
"no-useless-computed-key": "error",
"no-useless-concat": "error",
"no-useless-constructor": "error",
"no-useless-escape": "error",
"no-useless-rename": "error",
"no-var": "error",
"no-void": "error",
"no-warning-comments": "error",
"no-whitespace-before-property": "error",
"no-with": "error",
"object-curly-newline": "off",
"object-curly-spacing": "off",
"object-property-newline": [
"error",
{
"allowMultiplePropertiesPerLine": true
}
],
"object-shorthand": "off",
"one-var": "off",
"one-var-declaration-per-line": "error",
"operator-assignment": "error",
"operator-linebreak": "error",
"padded-blocks": "off",
"prefer-arrow-callback": "off",
"prefer-const": "off",
"prefer-numeric-literals": "error",
"prefer-reflect": "error",
"prefer-rest-params": "error",
"prefer-spread": "error",
"prefer-template": "error",
"quote-props": "off",
"quotes": ["error", "double", { "avoidEscape": true }],
"radix": "error",
"require-jsdoc": "error",
"rest-spread-spacing": "error",
"semi": "off",
"semi-spacing": "error",
"sort-imports": "off",
"sort-keys": "off",
"sort-vars": "error",
"space-before-blocks": "error",
"space-before-function-paren": "off",
"space-in-parens": [
"error",
"never"
],
"space-infix-ops": "error",
"space-unary-ops": "error",
"spaced-comment": [
"error",
"always"
],
"strict": "error",
"symbol-description": "error",
"template-curly-spacing": "error",
"unicode-bom": [
"error",
"never"
],
"valid-jsdoc": "error",
"vars-on-top": "error",
"wrap-iife": "error",
"wrap-regex": "error",
"yield-star-spacing": "error",
"yoda": "error",
"import/no-named-as-default": "off",
"import/no-extraneous-dependencies": "off",
"react/prefer-stateless-function": "off",
"react/jsx-filename-extension": "off",
"react/no-multi-comp": "off",
"react/sort-comp": "off"
}
"extends": "@decidim"
}
2 changes: 1 addition & 1 deletion .github/PULL_REQUEST_TEMPLATE.md
View file
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@
*Describe the best way to test or validate your PR.*

#### :clipboard: Checklist
:rotating_light: Please review the [guidelines for contributing](../CONTRIBUTING.adoc) to this repository.
:rotating_light: Please review the [guidelines for contributing](https://github.com/decidim/decidim/blob/develop/CONTRIBUTING.adoc) to this repository.

- [ ] :question: **CONSIDER** adding a unit test if your PR resolves an issue.
- [ ] :heavy_check_mark: **DO** check open PR's to avoid duplicates.
Expand Down
4 changes: 2 additions & 2 deletions .github/upload_coverage.sh
View file
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ SHA=`jq -r ".pull_request.head.sha // .check_run.head_sha // .after" $EVENT_PAYL

if [ $PRID = "null" ]
then
bash <(curl -s https://codecov.io/bash) -n $REPORT_NAME -C $SHA
bash <(curl -s https://codecov.io/bash) -n $REPORT_NAME -C $SHA -F $REPORT_NAME
else
bash <(curl -s https://codecov.io/bash) -n $REPORT_NAME -C $SHA -P $PRID
bash <(curl -s https://codecov.io/bash) -n $REPORT_NAME -C $SHA -P $PRID -F $REPORT_NAME
fi
Loading

0 comments on commit 27ce9f6

Please sign in to comment.