Skip to content

Commit

Permalink
Merge remote-tracking branch 'origin/master' into blocked-user-feature
Browse files Browse the repository at this point in the history
  • Loading branch information
nijil-deriv committed Aug 5, 2022
2 parents bf02178 + 703677b commit 4211075
Show file tree
Hide file tree
Showing 281 changed files with 1,919 additions and 1,450 deletions.
2 changes: 2 additions & 0 deletions .circleci/config.yml
Original file line number Diff line number Diff line change
Expand Up @@ -301,6 +301,7 @@ workflows:
branches:
only: /^master$/
- publish_cloudflare_staging:
context: binary-frontend-artifact-upload
requires:
- release_staging
filters:
Expand All @@ -317,6 +318,7 @@ workflows:
tags:
only: /^production.*/
- publish_cloudflare_production:
context: binary-frontend-artifact-upload
requires:
- release_production
filters:
Expand Down
2 changes: 1 addition & 1 deletion .eslintrc.js
Original file line number Diff line number Diff line change
Expand Up @@ -75,7 +75,7 @@ module.exports = {
],
'spaced-comment': 'off',
'import/prefer-default-export': 0,
'import/extensions': ['warn', 'never', { jsx: 'always', json: 'always' }],
'import/extensions': [0, { jsx: 'always', json: 'always' }],
'no-sequences': ['warn'],
'import/no-unresolved': [2, { ignore: ['@deriv/components', '@deriv/shared'] }],

Expand Down
Loading

0 comments on commit 4211075

Please sign in to comment.